http: init and cleanup separately from http-walker

Previously, all our http operations were done with http-walker. With the
new remote-curl helper, we find ourselves using http methods outside of
http-walker - for example, fetching info/refs.

Accomodate this by separating http_init() and http_cleanup() invocations
from http-walker.

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

diff --git a/http-fetch.c b/http-fetch.c
index ffd0ad7e295d7341776bb7b6407602cdb2997ef3..762c750d7af3651287c147034d3dead469453e7c 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "exec_cmd.h"
 #include "cache.h"
 #include "exec_cmd.h"

+#include "http.h"

 #include "walker.h"
 
 static const char http_fetch_usage[] = "git http-fetch "
 #include "walker.h"
 
 static const char http_fetch_usage[] = "git http-fetch "


@@ -69,7 +70,8 @@ int main(int argc, const char **argv)
                url = rewritten_url;
        }
 
                url = rewritten_url;
        }
 

-       walker = get_http_walker(url, NULL);
+       http_init(NULL);
+       walker = get_http_walker(url);

        walker->get_tree = get_tree;
        walker->get_history = get_history;
        walker->get_all = get_all;
        walker->get_tree = get_tree;
        walker->get_history = get_history;
        walker->get_all = get_all;


@@ -89,6 +91,7 @@ int main(int argc, const char **argv)
        }
 
        walker_free(walker);
        }
 
        walker_free(walker);

+       http_cleanup();

 
        free(rewritten_url);
 
 
        free(rewritten_url);
 

diff --git a/http-walker.c b/http-walker.c
index 508e35517c55b8b9f894c46a25e831f1ed3652b9..ef99ae647ae02995495c71455eef785bdeca1789 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -559,18 +559,14 @@ static void cleanup(struct walker *walker)
                free(data);
                walker->data = NULL;
        }
                free(data);
                walker->data = NULL;
        }

-
-       http_cleanup();

 }
 
 }
 

-struct walker *get_http_walker(const char *url, struct remote *remote)
+struct walker *get_http_walker(const char *url)

 {
        char *s;
        struct walker_data *data = xmalloc(sizeof(struct walker_data));
        struct walker *walker = xmalloc(sizeof(struct walker));
 
 {
        char *s;
        struct walker_data *data = xmalloc(sizeof(struct walker_data));
        struct walker *walker = xmalloc(sizeof(struct walker));
 

-       http_init(remote);
-

        data->alt = xmalloc(sizeof(*data->alt));
        data->alt->base = xmalloc(strlen(url) + 1);
        strcpy(data->alt->base, url);
        data->alt = xmalloc(sizeof(*data->alt));
        data->alt->base = xmalloc(strlen(url) + 1);
        strcpy(data->alt->base, url);

diff --git a/remote-curl.c b/remote-curl.c
index a904164e425097380781c1ecd9bb13f4feec0de6..e8485d1552e20f65eb4f4ebfb95d7365274d1105 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -25,7 +25,7 @@ static struct options options;
 static void init_walker(void)
 {
        if (!walker)
 static void init_walker(void)
 {
        if (!walker)

-               walker = get_http_walker(url, remote);
+               walker = get_http_walker(url);

 }
 
 static int set_option(const char *name, const char *value)
 }
 
 static int set_option(const char *name, const char *value)


@@ -810,6 +810,8 @@ int main(int argc, const char **argv)
                url = remote->url[0];
        }
 
                url = remote->url[0];
        }
 

+       http_init(remote);
+

        do {
                if (strbuf_getline(&buf, stdin, '\n') == EOF)
                        break;
        do {
                if (strbuf_getline(&buf, stdin, '\n') == EOF)
                        break;


@@ -855,5 +857,8 @@ int main(int argc, const char **argv)
                }
                strbuf_reset(&buf);
        } while (1);
                }
                strbuf_reset(&buf);
        } while (1);

+
+       http_cleanup();
+

        return 0;
 }
        return 0;
 }

diff --git a/walker.h b/walker.h
index 8a149e11084eeec4501b5b2c5d22e5266f4852e7..95e576548474e942addcf1978f215720dd2f6e96 100644 (file)
--- a/walker.h
+++ b/walker.h
@@ -34,6 +34,6 @@ int walker_fetch(struct walker *impl, int targets, char **target,
 
 void walker_free(struct walker *walker);
 
 
 void walker_free(struct walker *walker);
 

-struct walker *get_http_walker(const char *url, struct remote *remote);
+struct walker *get_http_walker(const char *url);

 
 #endif /* WALKER_H */
 
 #endif /* WALKER_H */