Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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>
  • Loading branch information...
commit 888692b733b3109874bb570bb0680e93287ed338 1 parent 09ae9ac
@rctay rctay authored gitster committed
Showing with 12 additions and 8 deletions.
  1. +4 −1 http-fetch.c
  2. +1 −5 http-walker.c
  3. +6 −1 remote-curl.c
  4. +1 −1  walker.h
View
5 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);
View
6 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);
View
7 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)
@@ -810,6 +810,8 @@ int main(int argc, const char **argv)
url = remote->url[0];
}
+ http_init(remote);
+
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);
+
+ http_cleanup();
+
return 0;
}
View
2  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 */
Please sign in to comment.
Something went wrong with that request. Please try again.