From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Clemens Buchacher" <drizzd@aon.at>,
"Mike Hommey" <mh@glandium.org>,
"Shawn O. Pearce" <spearce@spearce.org>
Subject: [PATCH 5/7] http: init and cleanup separately from http-walker
Date: Sun, 21 Feb 2010 11:08:26 +0800 [thread overview]
Message-ID: <1266721708-1060-6-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1266721708-1060-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 | 4 +---
remote-curl.c | 7 ++++++-
walker.h | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/http-fetch.c b/http-fetch.c
index ffd0ad7..e05b23a 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;
@@ -88,6 +90,7 @@ int main(int argc, const char **argv)
"status code. Suggest running 'git fsck'.\n");
}
+ http_cleanup();
walker_free(walker);
free(rewritten_url);
diff --git a/http-walker.c b/http-walker.c
index 508e355..bc39451 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -563,14 +563,12 @@ static void cleanup(struct walker *walker)
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
next prev parent reply other threads:[~2010-02-21 3:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-21 3:08 [PATCH 0/7] http: minor improvements Tay Ray Chuan
2010-02-21 3:08 ` [PATCH 1/7] t5541-http-push: check that ref is unchanged for non-ff test Tay Ray Chuan
2010-02-21 3:08 ` [PATCH 2/7] t554[01]-http-push: refactor, add non-ff tests Tay Ray Chuan
2010-02-21 3:08 ` [PATCH 3/7] http-push: remove useless condition Tay Ray Chuan
2010-02-21 10:40 ` Clemens Buchacher
2010-02-21 15:23 ` Tay Ray Chuan
2010-02-21 3:08 ` [PATCH 4/7] http-walker: cleanup more thoroughly Tay Ray Chuan
2010-02-21 3:08 ` Tay Ray Chuan [this message]
2010-02-21 10:38 ` [PATCH 5/7] http: init and cleanup separately from http-walker Clemens Buchacher
2010-02-21 10:57 ` Clemens Buchacher
2010-02-21 15:23 ` Tay Ray Chuan
2010-02-21 3:08 ` [PATCH 6/7] remote-curl: use http_fetch_ref() instead of walker wrapper Tay Ray Chuan
2010-02-21 3:08 ` [PATCH 7/7] remote-curl: init walker only when needed Tay Ray Chuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1266721708-1060-6-git-send-email-rctay89@gmail.com \
--to=rctay89@gmail.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).