xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

diff --git a/http-walker.c b/http-walker.c
index 8dbf9cc369c59d36930c6cf67fda8ed279d50922..2c3786870e1fbe94a5346cdbc53e6f806011052c 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -644,6 +644,7 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
        struct strbuf buffer = STRBUF_INIT;
        char *data;
        int i = 0;
+       int ret = 0;
 
        struct active_request_slot *slot;
        struct slot_results results;
@@ -666,19 +667,19 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
        if (start_active_slot(slot)) {
                run_active_slot(slot);
                if (results.curl_result != CURLE_OK) {
-                       strbuf_release(&buffer);
                        if (missing_target(&results)) {
                                repo->got_indices = 1;
-                               return 0;
+                               goto cleanup;
                        } else {
                                repo->got_indices = 0;
-                               return error("%s", curl_errorstr);
+                               ret = error("%s", curl_errorstr);
+                               goto cleanup;
                        }
                }
        } else {
                repo->got_indices = 0;
-               strbuf_release(&buffer);
-               return error("Unable to start request");
+               ret = error("Unable to start request");
+               goto cleanup;
        }
 
        data = buffer.buf;
@@ -701,9 +702,11 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
                i++;
        }
 
-       strbuf_release(&buffer);
        repo->got_indices = 1;
-       return 0;
+cleanup:
+       strbuf_release(&buffer);
+       free(url);
+       return ret;
 }
 
 static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
@@ -885,81 +888,10 @@ static int fetch(struct walker *walker, unsigned char *sha1)
                     data->alt->base);
 }
 
-static inline int needs_quote(int ch)
-{
-       if (((ch >= 'A') && (ch <= 'Z'))
-                       || ((ch >= 'a') && (ch <= 'z'))
-                       || ((ch >= '0') && (ch <= '9'))
-                       || (ch == '/')
-                       || (ch == '-')
-                       || (ch == '.'))
-               return 0;
-       return 1;
-}
-
-static inline int hex(int v)
-{
-       if (v < 10) return '0' + v;
-       else return 'A' + v - 10;
-}
-
-static char *quote_ref_url(const char *base, const char *ref)
-{
-       const char *cp;
-       char *dp, *qref;
-       int len, baselen, ch;
-
-       baselen = strlen(base);
-       len = baselen + 7; /* "/refs/" + NUL */
-       for (cp = ref; (ch = *cp) != 0; cp++, len++)
-               if (needs_quote(ch))
-                       len += 2; /* extra two hex plus replacement % */
-       qref = xmalloc(len);
-       memcpy(qref, base, baselen);
-       memcpy(qref + baselen, "/refs/", 6);
-       for (cp = ref, dp = qref + baselen + 6; (ch = *cp) != 0; cp++) {
-               if (needs_quote(ch)) {
-                       *dp++ = '%';
-                       *dp++ = hex((ch >> 4) & 0xF);
-                       *dp++ = hex(ch & 0xF);
-               }
-               else
-                       *dp++ = ch;
-       }
-       *dp = 0;
-
-       return qref;
-}
-
 static int fetch_ref(struct walker *walker, char *ref, unsigned char *sha1)
 {
-       char *url;
-       struct strbuf buffer = STRBUF_INIT;
        struct walker_data *data = walker->data;
-       const char *base = data->alt->base;
-       struct active_request_slot *slot;
-       struct slot_results results;
-
-       url = quote_ref_url(base, ref);
-       slot = get_active_slot();
-       slot->results = &results;
-       curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
-       curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
-       curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
-       curl_easy_setopt(slot->curl, CURLOPT_URL, url);
-       if (start_active_slot(slot)) {
-               run_active_slot(slot);
-               if (results.curl_result != CURLE_OK)
-                       return error("Couldn't get %s for %s\n%s",
-                                    url, ref, curl_errorstr);
-       } else {
-               return error("Unable to start request");
-       }
-
-       strbuf_rtrim(&buffer);
-       if (buffer.len != 40)
-               return 1;
-       return get_sha1_hex(buffer.buf, sha1);
+       return http_fetch_ref(data->alt->base, ref, sha1);
 }
 
 static void cleanup(struct walker *walker)