[PATCH v2 5/7] http: init and cleanup separately from http-walker
- From
Tay Ray Chuan <rctay89@gmail.com>
- Date
- Mar 2, 2010, 10:49 UTC
- Message-ID
- <1267526971-5552-6-git-send-email-rctay89@gmail.com>
- In-Reply-To
- <1267526971-5552-1-git-send-email-rctay89@gmail.com>
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> --- http-fetch.c | 5 ++++- http-walker.c | 6 +----- remote-curl.c | 7 ++++++- walker.h | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/http-fetch.c b/http-fetch.c index ffd0ad7..762c750 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -1,5 +1,6 @@ #include "cache.h" #include "exec_cmd.h" +#include "http.h" #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; } - 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; @@ -89,6 +91,7 @@ int main(int argc, const char **argv) } walker_free(walker); + http_cleanup(); free(rewritten_url); diff --git a/http-walker.c b/http-walker.c index 508e355..ef99ae6 100644 --- a/http-walker.c +++ b/http-walker.c @@ -559,18 +559,14 @@ static void cleanup(struct walker *walker) 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)); - http_init(remote); - 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 d388120..1e13fb5 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -25,7 +25,7 @@ static struct options options; 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) @@ -811,6 +811,8 @@ int main(int argc, const char **argv) url = remote->url[0]; } + http_init(remote); + do { if (strbuf_getline(&buf, stdin, '\n') == EOF) break; @@ -856,5 +858,8 @@ int main(int argc, const char **argv) } strbuf_reset(&buf); } while (1); + + http_cleanup(); + return 0; } diff --git a/walker.h b/walker.h index 8a149e1..95e5765 100644 --- 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); -struct walker *get_http_walker(const char *url, struct remote *remote); +struct walker *get_http_walker(const char *url); #endif /* WALKER_H */
-- 1.7.0.26.gbfa16