This should behave identically to the current strbuf code,
but opens up room for us to do more clever things with
bundles in a future patch.
Signed-off-by: Jeff King <redacted>
---
Obviously it's way more code for the same thing, but future patches will
make the design more clear.
remote-curl.c | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c
index 0e720ee..fb4d853 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -90,6 +90,24 @@ static void free_discovery(struct discovery *d)
}
}
+struct get_refs_cb_data {
+ struct strbuf *out;
+};
+
+static size_t get_refs_callback(char *buf, size_t sz, size_t n, void *vdata)
+{
+ struct get_refs_cb_data *data = vdata;
+ strbuf_add(data->out, buf, sz * n);
+ return sz * n;
+}
+
+static int get_refs_from_url(const char *url, struct strbuf *out, int options)
+{
+ struct get_refs_cb_data data;
+ data.out = out;
+ return http_get_callback(url, get_refs_callback, &data, 0, options);
+}
+
static struct discovery* discover_refs(const char *service)
{
struct strbuf buffer = STRBUF_INIT;@@ -112,7 +130,7 @@ static void free_discovery(struct discovery *d)
}
refs_url = strbuf_detach(&buffer, NULL);
- http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
+ http_ret = get_refs_from_url(refs_url, &buffer, HTTP_NO_CACHE);
/* try again with "plain" url (no ? or & appended) */
if (http_ret != HTTP_OK && http_ret != HTTP_NOAUTH) {@@ -123,7 +141,7 @@ static void free_discovery(struct discovery *d)
strbuf_addf(&buffer, "%sinfo/refs", url);
refs_url = strbuf_detach(&buffer, NULL);
- http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
+ http_ret = get_refs_from_url(refs_url, &buffer, HTTP_NO_CACHE);
}
switch (http_ret) {--
1.7.7.2.7.g9f96f