git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 01/10] http.c: make finish_active_slot() and handle_curl_result() static

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 14, 2015, 23:40 UTC
Message-ID
<1421278855-8126-2-git-send-email-gitster@pobox.com>
In-Reply-To
<1421278855-8126-1-git-send-email-gitster@pobox.com>
No external callers exist.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 http.c | 64 ++++++++++++++++++++++++++++++++--------------------------------
 http.h |  2 --
 2 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/http.c b/http.c
index 040f362..16a6a2d 100644
--- a/http.c
+++ b/http.c
@@ -114,6 +114,37 @@ size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf)
 	return eltsize * nmemb;
 }
 
+static void closedown_active_slot(struct active_request_slot *slot)
+{
+	active_requests--;
+	slot->in_use = 0;
+}
+
+static void finish_active_slot(struct active_request_slot *slot)
+{
+	closedown_active_slot(slot);
+	curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
+
+	if (slot->finished != NULL)
+		(*slot->finished) = 1;
+
+	/* Store slot results so they can be read after the slot is reused */
+	if (slot->results != NULL) {
+		slot->results->curl_result = slot->curl_result;
+		slot->results->http_code = slot->http_code;
+#if LIBCURL_VERSION_NUM >= 0x070a08
+		curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
+				  &slot->results->auth_avail);
+#else
+		slot->results->auth_avail = 0;
+#endif
+	}
+
+	/* Run callback if appropriate */
+	if (slot->callback_func != NULL)
+		slot->callback_func(slot->callback_data);
+}
+
 #ifdef USE_CURL_MULTI
 static void process_curl_messages(void)
 {
@@ -730,12 +761,6 @@ void run_active_slot(struct active_request_slot *slot)
 #endif
 }
 
-static void closedown_active_slot(struct active_request_slot *slot)
-{
-	active_requests--;
-	slot->in_use = 0;
-}
-
 static void release_active_slot(struct active_request_slot *slot)
 {
 	closedown_active_slot(slot);
@@ -752,31 +777,6 @@ static void release_active_slot(struct active_request_slot *slot)
 #endif
 }
 
-void finish_active_slot(struct active_request_slot *slot)
-{
-	closedown_active_slot(slot);
-	curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
-
-	if (slot->finished != NULL)
-		(*slot->finished) = 1;
-
-	/* Store slot results so they can be read after the slot is reused */
-	if (slot->results != NULL) {
-		slot->results->curl_result = slot->curl_result;
-		slot->results->http_code = slot->http_code;
-#if LIBCURL_VERSION_NUM >= 0x070a08
-		curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
-				  &slot->results->auth_avail);
-#else
-		slot->results->auth_avail = 0;
-#endif
-	}
-
-	/* Run callback if appropriate */
-	if (slot->callback_func != NULL)
-		slot->callback_func(slot->callback_data);
-}
-
 void finish_all_active_slots(void)
 {
 	struct active_request_slot *slot = active_queue_head;
@@ -839,7 +839,7 @@ char *get_remote_object_url(const char *url, const char *hex,
 	return strbuf_detach(&buf, NULL);
 }
 
-int handle_curl_result(struct slot_results *results)
+static int handle_curl_result(struct slot_results *results)
 {
 	/*
 	 * If we see a failing http code with CURLE_OK, we have turned off
diff --git a/http.h b/http.h
index 473179b..49afe39 100644
--- a/http.h
+++ b/http.h
@@ -85,9 +85,7 @@ extern curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
 extern struct active_request_slot *get_active_slot(void);
 extern int start_active_slot(struct active_request_slot *slot);
 extern void run_active_slot(struct active_request_slot *slot);
-extern void finish_active_slot(struct active_request_slot *slot);
 extern void finish_all_active_slots(void);
-extern int handle_curl_result(struct slot_results *results);
 
 /*
  * This will run one slot to completion in a blocking manner, similar to how

-- 
2.3.0-rc0-134-g109a908
Previous: Junio C HamanoNext: Jeff King
Message 2 of 19 in “mark private symbols static”
  1. 00/10 mark private symbols staticJunio C Hamano, Jan 14, 2015
  2. 01/10 http.c: make finish_active_slot() and handle_curl_result() staticJunio C Hamano, Jan 14, 2015
  3. Jeff KingJan 15, 2015
  4. 02/10 line-log.c: make line_log_data_init() staticJunio C Hamano, Jan 14, 2015
  5. 03/10 prompt.c: remove git_getpass() nobody usesJunio C Hamano, Jan 14, 2015
  6. Jeff KingJan 15, 2015
  7. 04/10 revision.c: make save_parents() and free_saved_parents() staticJunio C Hamano, Jan 14, 2015
  8. 05/10 urlmatch.c: make match_urls() staticJunio C Hamano, Jan 14, 2015
  9. Jeff KingJan 15, 2015
  10. 06/10 remote.c: make clear_cas_option() staticJunio C Hamano, Jan 14, 2015
  11. 07/10 shallow.c: make check_shallow_file_for_update() staticJunio C Hamano, Jan 14, 2015
  12. 08/10 pack-bitmap.c: make pack_bitmap_filename() staticJunio C Hamano, Jan 14, 2015
  13. Jeff KingJan 15, 2015
  14. 09/10 read-cache.c: make fill/match_stat_data() staticJunio C Hamano, Jan 14, 2015
  15. 10/10 commit: show "Author:" hint when the ident is not given explicitlyJunio C Hamano, Jan 14, 2015
  16. Jeff KingJan 15, 2015
  17. Stefan BellerJan 15, 2015
  18. Jeff KingJan 15, 2015
  19. Junio C HamanoJan 15, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.