curl_easy_upkeep: removed 'conn' from the name

... including the associated option.

Fixes #2951
Closes #2952

4 files changed, 5 insertions, 5 deletions

diff --git a/lib/easy.c b/lib/easy.c
index 83433f1f5..88fc4f460 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1201,7 +1201,7 @@ CURLcode curl_easy_send(struct Curl_easy *data, const void *buffer,
 /*
  * Performs connection upkeep for the given session handle.
  */
-CURLcode curl_easy_conn_upkeep(struct Curl_easy *data)
+CURLcode curl_easy_upkeep(struct Curl_easy *data)
 {
   /* Verify that we got an easy handle we can work with. */
   if(!GOOD_EASY_HANDLE(data))
@@ -1209,7 +1209,7 @@ CURLcode curl_easy_conn_upkeep(struct Curl_easy *data)
 
   if(data->multi_easy) {
     /* Use the common function to keep connections alive. */
-    return Curl_conn_upkeep(&data->multi_easy->conn_cache, data);
+    return Curl_upkeep(&data->multi_easy->conn_cache, data);
   }
   else {
     /* No connections, so just return success */
diff --git a/lib/setopt.c b/lib/setopt.c
index 13c7da960..22956a20f 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -2624,7 +2624,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,
                             va_arg(param, char *));
     data->set.doh = data->set.str[STRING_DOH]?TRUE:FALSE;
     break;
-  case CURLOPT_CONN_UPKEEP_INTERVAL_MS:
+  case CURLOPT_UPKEEP_INTERVAL_MS:
     arg = va_arg(param, long);
     if(arg < 0)
       return CURLE_BAD_FUNCTION_ARGUMENT;
diff --git a/lib/url.c b/lib/url.c
index bd8e5d95e..977f1d6ad 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4871,7 +4871,7 @@ static int conn_upkeep(struct connectdata *conn,
   return 0; /* continue iteration */
 }
 
-CURLcode Curl_conn_upkeep(struct conncache *conn_cache,
+CURLcode Curl_upkeep(struct conncache *conn_cache,
                           void *data)
 {
   /* Loop over every connection and make connection alive. */
diff --git a/lib/url.h b/lib/url.h
index 089613abd..3eb733a0a 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -77,7 +77,7 @@ int Curl_removeHandleFromPipeline(struct Curl_easy *handle,
 void Curl_getoff_all_pipelines(struct Curl_easy *data,
                                struct connectdata *conn);
 
-CURLcode Curl_conn_upkeep(struct conncache *conn_cache, void *data);
+CURLcode Curl_upkeep(struct conncache *conn_cache, void *data);
 
 #define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */
 #define CURL_DEFAULT_HTTPS_PROXY_PORT 443 /* default https proxy port unless