From mboxrd@z Thu Jan 1 00:00:00 1970 From: skimo@liacs.nl Subject: [PATCH 04/22] http.h: make fill_active_slots a function pointer Date: Thu, 24 May 2007 00:22:53 +0200 Message-ID: <11799589913816-git-send-email-skimo@liacs.nl> References: <11799589913153-git-send-email-skimo@liacs.nl> Cc: Martin Waitz , Alex Riesen To: git@vger.kernel.org, Junio C Hamano X-From: git-owner@vger.kernel.org Thu May 24 00:23:46 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HqzFB-0003Mx-Lq for gcvg-git@gmane.org; Thu, 24 May 2007 00:23:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756248AbXEWWXj (ORCPT ); Wed, 23 May 2007 18:23:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756786AbXEWWXi (ORCPT ); Wed, 23 May 2007 18:23:38 -0400 Received: from rhodium.liacs.nl ([132.229.131.16]:33740 "EHLO rhodium.liacs.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756248AbXEWWXf (ORCPT ); Wed, 23 May 2007 18:23:35 -0400 Received: from pc117b.liacs.nl (pc117b.liacs.nl [132.229.129.143]) by rhodium.liacs.nl (8.13.0/8.13.0/LIACS 1.4) with ESMTP id l4NMNB1s011549; Thu, 24 May 2007 00:23:16 +0200 Received: by pc117b.liacs.nl (Postfix, from userid 17122) id ADED87DDA2; Thu, 24 May 2007 00:23:11 +0200 (CEST) X-Mailer: git-send-email 1.5.0.rc3.1762.g0934 In-Reply-To: <11799589913153-git-send-email-skimo@liacs.nl> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: From: Sven Verdoolaege This allows us to use the methods provided by http.c from within libgit, in particular config.c. Signed-off-by: Sven Verdoolaege --- 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 79d2c38..8f253fd 100644 --- a/http-push.c +++ b/http-push.c @@ -795,7 +795,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; @@ -2356,6 +2356,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.784.g5532e