mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http: init and cleanup separately from http-walker

Browse Source 
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>
This commit is contained in:
Tay Ray Chuan
2010-03-02 18:49:29 +08:00
committed by Junio C Hamano
parent 09ae9aca14
commit 888692b733
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
http-fetch.c
View File

@ -1,5 +1,6 @@
#include "cache.h" #include "cache.h"
#include "exec_cmd.h" #include "exec_cmd.h"
#include "http.h"
#include "walker.h" #include "walker.h"
static const char http_fetch_usage[] = "git http-fetch " 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_tree = get_tree;
walker->get_history = get_history; walker->get_history = get_history;
walker->get_all = get_all; 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);

6
http-walker.c
View File

@ -559,18 +559,14 @@ static void cleanup(struct walker *walker)
free(data); free(data);
walker->data = NULL; 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; char *s;
struct walker_data *data = xmalloc(sizeof(struct walker_data)); struct walker_data *data = xmalloc(sizeof(struct walker_data));
struct walker *walker = xmalloc(sizeof(struct walker)); struct walker *walker = xmalloc(sizeof(struct walker));
http_init(remote);
data->alt = xmalloc(sizeof(*data->alt)); data->alt = xmalloc(sizeof(*data->alt));
data->alt->base = xmalloc(strlen(url) + 1); data->alt->base = xmalloc(strlen(url) + 1);
strcpy(data->alt->base, url); strcpy(data->alt->base, url);

7
remote-curl.c
View File

@ -25,7 +25,7 @@ static struct options options;
static void init_walker(void) static void init_walker(void)
{ {
if (!walker) 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 { do {
if (strbuf_getline(&buf, stdin, '\n') == EOF) if (strbuf_getline(&buf, stdin, '\n') == EOF)
break; break;
@ -855,5 +857,8 @@ int main(int argc, const char **argv)
} }
strbuf_reset(&buf); strbuf_reset(&buf);
} while (1); } while (1);
http_cleanup();
return 0; return 0;
} }

2
walker.h
View File

@ -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 */