multi: change prefix for the network change bits to CURLMNWC_

Because "CURLM_" is used for curl multi error codes and it is convenient
to use the prefix to identify the number family.

Closes #18176

diff --git a/docs/libcurl/opts/CURLMOPT_NETWORK_CHANGED.md b/docs/libcurl/opts/CURLMOPT_NETWORK_CHANGED.md
index bcfd1cdd37f7f05bfafb42599a78095846b2b77c..a38a9a83ba173d8f2dbaa27962d0cfa3b52c1fb2 100644 (file)
--- a/docs/libcurl/opts/CURLMOPT_NETWORK_CHANGED.md
+++ b/docs/libcurl/opts/CURLMOPT_NETWORK_CHANGED.md
@@ -42,13 +42,13 @@ to clear the caches.
 The call affects only the connection and DNS cache of the multi handle
 itself and not the ones owned by SHARE handles.
 
-## CURLM_NWCOPT_CLEAR_CONNS
+## CURLMNWC_CLEAR_CONNS
 
 No longer reuse any existing connection in the multi handle's
 connection cache. This closes all connections that are not in use.
 Ongoing transfers continue on the connections they operate on.
 
-## CURLM_NWCOPT_CLEAR_DNS
+## CURLMNWC_CLEAR_DNS
 
 Clear the multi handle's DNS cache.
 
@@ -66,7 +66,7 @@ int main(void)
   CURLM *m = curl_multi_init();
   /* do transfers on the multi handle */
   /* do not reuse existing connections */
-  curl_multi_setopt(m, CURLMOPT_NETWORK_CHANGED, CURLM_NWCOPT_CLEAR_CONNS);
+  curl_multi_setopt(m, CURLMOPT_NETWORK_CHANGED, CURLMNWC_CLEAR_CONNS);
 }
 ~~~
 

diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index d2a4cc598e5bdce6eca0403fec80a92998817818..bfcf357bf6fb099d8b1d3388630088c66e5f5255 100644 (file)
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -545,21 +545,21 @@ CURLM_BAD_SOCKET                7.15.4
 CURLM_CALL_MULTI_PERFORM        7.9.6
 CURLM_CALL_MULTI_SOCKET         7.15.5
 CURLM_INTERNAL_ERROR            7.9.6
-CURLM_NWCOPT_CLEAR_CONNS        8.16.0
-CURLM_NWCOPT_CLEAR_DNS          8.16.0
 CURLM_OK                        7.9.6
 CURLM_OUT_OF_MEMORY             7.9.6
 CURLM_RECURSIVE_API_CALL        7.59.0
 CURLM_UNKNOWN_OPTION            7.15.4
 CURLM_UNRECOVERABLE_POLL        7.84.0
 CURLM_WAKEUP_FAILURE            7.68.0
+CURLMIMEOPT_FORMESCAPE          7.81.0
 CURLMINFO_NONE                  8.16.0
+CURLMINFO_XFERS_ADDED           8.16.0
 CURLMINFO_XFERS_CURRENT         8.16.0
-CURLMINFO_XFERS_RUNNING         8.16.0
-CURLMINFO_XFERS_PENDING         8.16.0
 CURLMINFO_XFERS_DONE            8.16.0
-CURLMINFO_XFERS_ADDED           8.16.0
-CURLMIMEOPT_FORMESCAPE          7.81.0
+CURLMINFO_XFERS_PENDING         8.16.0
+CURLMINFO_XFERS_RUNNING         8.16.0
+CURLMNWC_CLEAR_CONNS            8.16.0
+CURLMNWC_CLEAR_DNS              8.16.0
 CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE 7.30.0
 CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE 7.30.0
 CURLMOPT_MAX_CONCURRENT_STREAMS  7.67.0

diff --git a/include/curl/multi.h b/include/curl/multi.h
index e336c94a88377452bff31055b19bbbd4eace9708..782541f1abbdbd961db01d2bcdaf1efd9a7f79bc 100644 (file)
--- a/include/curl/multi.h
+++ b/include/curl/multi.h
@@ -403,15 +403,15 @@ typedef enum {
 
 /* Definition of bits for the CURLMOPT_NETWORK_CHANGED argument: */
 
-/* - CURLM_NWCOPT_CLEAR_CONNS tells libcurl to prevent further reuse
-     of existing connections. Connections that are idle will be closed.
-     Ongoing transfers will continue with the connection they have. */
-#define CURLM_NWCOPT_CLEAR_CONNS (1L<<0)
-
-/* - CURLM_NWCOPT_CLEAR_DNS tells libcurl to prevent further reuse
-     of existing connections. Connections that are idle will be closed.
-     Ongoing transfers will continue with the connection they have. */
-#define CURLM_NWCOPT_CLEAR_DNS (1L<<0)
+/* - CURLMNWC_CLEAR_CONNS tells libcurl to prevent further reuse of existing
+   connections. Connections that are idle will be closed. Ongoing transfers
+   will continue with the connection they have. */
+#define CURLMNWC_CLEAR_CONNS (1L<<0)
+
+/* - CURLMNWC_CLEAR_DNS tells libcurl to prevent further reuse of existing
+   connections. Connections that are idle will be closed. Ongoing transfers
+   will continue with the connection they have. */
+#define CURLMNWC_CLEAR_DNS (1L<<0)
 
 /*
  * Name:    curl_multi_setopt()

diff --git a/lib/multi.c b/lib/multi.c
index 9a653cf9591a86806a226e1d902bf8026b8bc9be..370cb97d5382f04707ff1fb05bcd4ddfd99faeda 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -3244,13 +3244,13 @@ CURLMcode curl_multi_setopt(CURLM *m,
     }
     break;
   case CURLMOPT_NETWORK_CHANGED: {
-      long val = va_arg(param, long);
-      if(val & CURLM_NWCOPT_CLEAR_DNS) {
-        Curl_dnscache_clear(multi->admin);
-      }
-      if(val & CURLM_NWCOPT_CLEAR_CONNS) {
-        Curl_cpool_nw_changed(multi->admin);
-      }
+    long val = va_arg(param, long);
+    if(val & CURLMNWC_CLEAR_DNS) {
+      Curl_dnscache_clear(multi->admin);
+    }
+    if(val & CURLMNWC_CLEAR_CONNS) {
+      Curl_cpool_nw_changed(multi->admin);
+    }
     break;
   }
   default:

diff --git a/tests/libtest/lib3033.c b/tests/libtest/lib3033.c
index 692541329e66fde969176d406366955bf4bc8d71..1c0b9856fcebb59796d019d2d47c402c01f39f86 100644 (file)
--- a/tests/libtest/lib3033.c
+++ b/tests/libtest/lib3033.c
@@ -36,7 +36,7 @@ static CURLcode t3033_req_test(CURLM *multi, CURL *easy,
 
   if(index == 1) {
     curl_multi_setopt(multi, CURLMOPT_NETWORK_CHANGED,
-                      CURLM_NWCOPT_CLEAR_CONNS);
+                      CURLMNWC_CLEAR_CONNS);
     curl_mprintf("[1] signal network change\n");
   }
   else {