[Libguestfs] [PATCH nbdkit v2 2/9] curl: Rename unload_config, unload_pool -> config_unload, pool_unload

For consistency with scripts_unload. There is still a function called load_pool, but that inconsistency will be removed in a follow-on commit. --- plugins/curl/curldefs.h | 4 ++-- plugins/curl/config.c | 2 +- plugins/curl/curl.c | 4 ++-- plugins/curl/pool.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/curl/curldefs.h b/plugins/curl/curldefs.h index 9169b256d..eb168c524 100644 --- a/plugins/curl/curldefs.h +++ b/plugins/curl/curldefs.h @@ -106,13 +106,13 @@ struct curl_handle { extern int curl_config (const char *key, const char *value); extern int curl_config_complete (void); extern const char *curl_config_help; -extern void unload_config (void); +extern void config_unload (void); extern struct curl_handle *allocate_handle (void); extern void free_handle (struct curl_handle *); /* pool.c */ extern void load_pool (void); -extern void unload_pool (void); +extern void pool_unload (void); extern struct curl_handle *get_handle (void); extern void put_handle (struct curl_handle *ch); diff --git a/plugins/curl/config.c b/plugins/curl/config.c index 742d60809..b6e02b85a 100644 --- a/plugins/curl/config.c +++ b/plugins/curl/config.c @@ -100,7 +100,7 @@ static size_t error_cb (char *ptr, size_t size, size_t nmemb, void *opaque); NBDKIT_DLL_PUBLIC int curl_debug_verbose = 0; void -unload_config (void) +config_unload (void) { free (cookie); if (headers) diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c index 99a7e00b5..729710935 100644 --- a/plugins/curl/curl.c +++ b/plugins/curl/curl.c @@ -74,9 +74,9 @@ curl_load (void) static void curl_unload (void) { - unload_config (); + config_unload (); scripts_unload (); - unload_pool (); + pool_unload (); display_times (); curl_global_cleanup (); } diff --git a/plugins/curl/pool.c b/plugins/curl/pool.c index 91e56f070..50a623a4e 100644 --- a/plugins/curl/pool.c +++ b/plugins/curl/pool.c @@ -86,7 +86,7 @@ load_pool (void) /* Close and free all handles in the pool. */ void -unload_pool (void) +pool_unload (void) { size_t i; -- 2.41.0