From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 5 Aug 2025 09:39:32 +0000 (+0200)
Subject: multi: change prefix for the network change bits to CURLMNWC_
X-Git-Tag: curl-8_16_0~251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3689ef21bde91c549b15ea7818e623914b87d702;p=thirdparty%2Fcurl.git

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 bcfd1cdd37..a38a9a83ba 100644
--- 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 d2a4cc598e..bfcf357bf6 100644
--- 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 e336c94a88..782541f1ab 100644
--- 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 9a653cf959..370cb97d53 100644
--- 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 692541329e..1c0b9856fc 100644
--- 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 {