[PATCH] http.h: make fill_active_slots a function pointer
From: Sven Verdoolaege <hidden>
Date: 2016-06-15 22:43:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Sven Verdoolaege <redacted> This allows us to use the methods provided by http.c from within libgit, in particular config.c. Signed-off-by: Sven Verdoolaege <redacted> --- http-fetch.c | 5 ++++- http-push.c | 5 ++++- http.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/http-fetch.c b/http-fetch.c
index 09baedc..53fb2a9 100644
--- a/http-fetch.c
+++ b/http-fetch.c@@ -317,7 +317,7 @@ static void release_object_request(struct object_request *obj_req) } #ifdef USE_CURL_MULTI -void fill_active_slots(void) +static void fetch_fill_active_slots(void) { struct object_request *obj_req = object_queue_head; struct active_request_slot *slot = active_queue_head;
@@ -1031,6 +1031,9 @@ int main(int argc, const char **argv) } url = argv[arg]; +#ifdef USE_CURL_MULTI + fill_active_slots = fetch_fill_active_slots; +#endif http_init(); no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
diff --git a/http-push.c b/http-push.c
index e3f7675..d4c850b 100644
--- a/http-push.c
+++ b/http-push.c@@ -794,7 +794,7 @@ static void finish_request(struct transfer_request *request) } #ifdef USE_CURL_MULTI -void fill_active_slots(void) +static void push_fill_active_slots(void) { struct transfer_request *request = request_queue_head; struct transfer_request *next;
@@ -2355,6 +2355,9 @@ int main(int argc, char **argv) memset(remote_dir_exists, -1, 256); +#ifdef USE_CURL_MULTI + fill_active_slots = push_fill_active_slots; +#endif http_init(); no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
diff --git a/http.h b/http.h
index 69b6b66..7a41cde 100644
--- a/http.h
+++ b/http.h@@ -69,7 +69,7 @@ extern void finish_all_active_slots(void); extern void release_active_slot(struct active_request_slot *slot); #ifdef USE_CURL_MULTI -extern void fill_active_slots(void); +extern void (*fill_active_slots)(void); extern void step_active_slots(void); #endif
--
1.5.2.rc1.25.g889f-dirty