curl-util: Make some curl symbols private

diff --git a/src/shared/curl-util.c b/src/shared/curl-util.c
index 9254b83dd74fbd29cf9d1f8295c64a23c60a840b..0a6bdeefe5589e7adc5595163ba3d0fb5d1d9c04 100644 (file)
--- a/src/shared/curl-util.c
+++ b/src/shared/curl-util.c
@@ -29,17 +29,19 @@ DLSYM_PROTOTYPE(curl_easy_strerror) = NULL;
 DLSYM_PROTOTYPE(curl_easy_header) = NULL;
 #endif
 DLSYM_PROTOTYPE(curl_getdate) = NULL;
-DLSYM_PROTOTYPE(curl_multi_add_handle) = NULL;
-DLSYM_PROTOTYPE(curl_multi_assign) = NULL;
-DLSYM_PROTOTYPE(curl_multi_cleanup) = NULL;
-DLSYM_PROTOTYPE(curl_multi_info_read) = NULL;
-DLSYM_PROTOTYPE(curl_multi_init) = NULL;
-DLSYM_PROTOTYPE(curl_multi_remove_handle) = NULL;
-DLSYM_PROTOTYPE(curl_multi_setopt) = NULL;
-DLSYM_PROTOTYPE(curl_multi_socket_action) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_add_handle) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_assign) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_cleanup) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_info_read) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_init) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_remove_handle) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_setopt) = NULL;
+static DLSYM_PROTOTYPE(curl_multi_socket_action) = NULL;
 DLSYM_PROTOTYPE(curl_slist_append) = NULL;
 DLSYM_PROTOTYPE(curl_slist_free_all) = NULL;
 
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(CURLM*, sym_curl_multi_cleanup, curl_multi_cleanupp, NULL);
+
 static void curl_glue_check_finished(CurlGlue *g) {
         int r;
 

diff --git a/src/shared/curl-util.h b/src/shared/curl-util.h
index 112649f371ba79467d03948f2a1e6b5e62a42d7c..33ab0a5fb204bb23e3e80bf4610b02fb197eee8e 100644 (file)
--- a/src/shared/curl-util.h
+++ b/src/shared/curl-util.h
@@ -18,14 +18,6 @@ extern DLSYM_PROTOTYPE(curl_easy_strerror);
 extern DLSYM_PROTOTYPE(curl_easy_header);
 #endif
 extern DLSYM_PROTOTYPE(curl_getdate);
-extern DLSYM_PROTOTYPE(curl_multi_add_handle);
-extern DLSYM_PROTOTYPE(curl_multi_assign);
-extern DLSYM_PROTOTYPE(curl_multi_cleanup);
-extern DLSYM_PROTOTYPE(curl_multi_info_read);
-extern DLSYM_PROTOTYPE(curl_multi_init);
-extern DLSYM_PROTOTYPE(curl_multi_remove_handle);
-extern DLSYM_PROTOTYPE(curl_multi_setopt);
-extern DLSYM_PROTOTYPE(curl_multi_socket_action);
 extern DLSYM_PROTOTYPE(curl_slist_append);
 extern DLSYM_PROTOTYPE(curl_slist_free_all);
 
@@ -66,7 +58,6 @@ int curl_parse_http_time(const char *t, usec_t *ret);
 int curl_append_to_header(struct curl_slist **list, char **headers);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(CURL*, sym_curl_easy_cleanup, curl_easy_cleanupp, NULL);
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(CURLM*, sym_curl_multi_cleanup, curl_multi_cleanupp, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct curl_slist*, sym_curl_slist_free_all, curl_slist_free_allp, NULL);
 
 #endif