remote-curl: init walker only when needed

Invoke get_http_walker() only when fetching with the dumb protocol.
Additionally, add an invocation to walker_free() after we're done using
the walker.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote-curl.c b/remote-curl.c
index aa9f279014d9c0dcda7b90d647fea695e945a9dd..1f8bc2db73a5a7fb41734b9866c184c7aa90c897 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -10,7 +10,6 @@
 
 static struct remote *remote;
 static const char *url;
 
 static struct remote *remote;
 static const char *url;

-static struct walker *walker;

 
 struct options {
        int verbosity;
 
 struct options {
        int verbosity;


@@ -22,12 +21,6 @@ struct options {
 };
 static struct options options;
 
 };
 static struct options options;
 

-static void init_walker(void)
-{
-       if (!walker)
-               walker = get_http_walker(url);
-}
-

 static int set_option(const char *name, const char *value)
 {
        if (!strcmp(name, "verbosity")) {
 static int set_option(const char *name, const char *value)
 {
        if (!strcmp(name, "verbosity")) {


@@ -119,7 +112,6 @@ static struct discovery* discover_refs(const char *service)
        }
        refs_url = strbuf_detach(&buffer, NULL);
 
        }
        refs_url = strbuf_detach(&buffer, NULL);
 

-       init_walker();

        http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
 
        /* try again with "plain" url (no ? or & appended) */
        http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
 
        /* try again with "plain" url (no ? or & appended) */


@@ -500,7 +492,6 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
        struct child_process client;
        int err = 0;
 
        struct child_process client;
        int err = 0;
 

-       init_walker();

        memset(&client, 0, sizeof(client));
        client.in = -1;
        client.out = -1;
        memset(&client, 0, sizeof(client));
        client.in = -1;
        client.out = -1;


@@ -552,6 +543,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
 
 static int fetch_dumb(int nr_heads, struct ref **to_fetch)
 {
 
 static int fetch_dumb(int nr_heads, struct ref **to_fetch)
 {

+       struct walker *walker;

        char **targets = xmalloc(nr_heads * sizeof(char*));
        int ret, i;
 
        char **targets = xmalloc(nr_heads * sizeof(char*));
        int ret, i;
 


@@ -560,13 +552,14 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)
        for (i = 0; i < nr_heads; i++)
                targets[i] = xstrdup(sha1_to_hex(to_fetch[i]->old_sha1));
 
        for (i = 0; i < nr_heads; i++)
                targets[i] = xstrdup(sha1_to_hex(to_fetch[i]->old_sha1));
 

-       init_walker();
+       walker = get_http_walker(url);

        walker->get_all = 1;
        walker->get_tree = 1;
        walker->get_history = 1;
        walker->get_verbosely = options.verbosity >= 3;
        walker->get_recover = 0;
        ret = walker_fetch(walker, nr_heads, targets, NULL, NULL);
        walker->get_all = 1;
        walker->get_tree = 1;
        walker->get_history = 1;
        walker->get_verbosely = options.verbosity >= 3;
        walker->get_recover = 0;
        ret = walker_fetch(walker, nr_heads, targets, NULL, NULL);

+       walker_free(walker);

 
        for (i = 0; i < nr_heads; i++)
                free(targets[i]);
 
        for (i = 0; i < nr_heads; i++)
                free(targets[i]);