msvc: add missing push/pop for warning pragmas

Also fix indentation/formatting around similar pragmas.

Closes #16101

diff --git a/lib/ftp.c b/lib/ftp.c
index 4b527738179462889b301400c510295e2d93811c..cb0fada0c7545d45d5023a4504315512dbfd98af 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -4108,8 +4108,8 @@ static CURLcode ftp_disconnect(struct Curl_easy *data,
 }
 
 #ifdef _MSC_VER
-/* warning C4706: assignment within conditional expression */
-#pragma warning(disable:4706)
+#pragma warning(push)
+#pragma warning(disable:4706) /* assignment within conditional expression */
 #endif
 
 /***********************************************************************
@@ -4266,6 +4266,10 @@ CURLcode ftp_parse_url_path(struct Curl_easy *data)
   return CURLE_OK;
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 /* call this when the DO phase has completed */
 static CURLcode ftp_dophase_done(struct Curl_easy *data, bool connected)
 {

diff --git a/lib/ldap.c b/lib/ldap.c
index 4eeb013070c1a07ae292556e8fb1bf972a7a2e1c..0fa304bdf8e51d209e85c9b2aa46566e9af8c926 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -57,7 +57,7 @@
 #ifdef USE_WIN32_LDAP           /* Use Windows LDAP implementation. */
 # ifdef _MSC_VER
 #  pragma warning(push)
-#  pragma warning(disable: 4201)
+#  pragma warning(disable:4201)
 # endif
 # include <subauth.h>  /* for [P]UNICODE_STRING */
 # ifdef _MSC_VER

diff --git a/lib/telnet.c b/lib/telnet.c
index b75320f61323cace46d34a4c7aadd79ff69cf02a..589f9dab4938568ce29b0f905d363bdf79a4b729 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -779,8 +779,7 @@ static void printsub(struct Curl_easy *data,
 
 #ifdef _MSC_VER
 #pragma warning(push)
-/* warning C4706: assignment within conditional expression */
-#pragma warning(disable:4706)
+#pragma warning(disable:4706) /* assignment within conditional expression */
 #endif
 static bool str_is_nonascii(const char *str)
 {

diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h
index b26334bcf877a0318fb5f3291b84ee60c678d28d..69f1baddb8483a7af0744830904287d209eeed44 100644 (file)
--- a/lib/vtls/schannel.h
+++ b/lib/vtls/schannel.h
@@ -30,7 +30,7 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable: 4201)
+#pragma warning(disable:4201)
 #endif
 #include <subauth.h>
 #ifdef _MSC_VER

diff --git a/lib/warnless.c b/lib/warnless.c
index b44119516b96d8dc740b135fa4a7812f5cf5d453..41699600beece2afd759d9609e33a87bb509917c 100644 (file)
--- a/lib/warnless.c
+++ b/lib/warnless.c
@@ -126,8 +126,8 @@ int curlx_uztosi(size_t uznum)
 unsigned long curlx_uztoul(size_t uznum)
 {
 #ifdef __INTEL_COMPILER
-# pragma warning(push)
-# pragma warning(disable:810) /* conversion may lose significant bits */
+#  pragma warning(push)
+#  pragma warning(disable:810) /* conversion may lose significant bits */
 #endif
 
 #if ULONG_MAX < SIZE_T_MAX
@@ -136,7 +136,7 @@ unsigned long curlx_uztoul(size_t uznum)
   return (unsigned long)(uznum & (size_t) CURL_MASK_ULONG);
 
 #ifdef __INTEL_COMPILER
-# pragma warning(pop)
+#  pragma warning(pop)
 #endif
 }
 
@@ -147,8 +147,8 @@ unsigned long curlx_uztoul(size_t uznum)
 unsigned int curlx_uztoui(size_t uznum)
 {
 #ifdef __INTEL_COMPILER
-# pragma warning(push)
-# pragma warning(disable:810) /* conversion may lose significant bits */
+#  pragma warning(push)
+#  pragma warning(disable:810) /* conversion may lose significant bits */
 #endif
 
 #if UINT_MAX < SIZE_T_MAX
@@ -157,7 +157,7 @@ unsigned int curlx_uztoui(size_t uznum)
   return (unsigned int)(uznum & (size_t) CURL_MASK_UINT);
 
 #ifdef __INTEL_COMPILER
-# pragma warning(pop)
+#  pragma warning(pop)
 #endif
 }
 

diff --git a/src/tool_writeout_json.c b/src/tool_writeout_json.c
index 205b702ae1fc996f031eba8673672224564ea403..d85243b51ac215b0881313bb2c3444f981e317ec 100644 (file)
--- a/src/tool_writeout_json.c
+++ b/src/tool_writeout_json.c
@@ -119,8 +119,8 @@ void ourWriteOutJSON(FILE *stream, const struct writeoutvar mappings[],
 }
 
 #ifdef _MSC_VER
-/* warning C4706: assignment within conditional expression */
-#pragma warning(disable:4706)
+#pragma warning(push)
+#pragma warning(disable:4706) /* assignment within conditional expression */
 #endif
 
 void headerJSON(FILE *stream, struct per_transfer *per)
@@ -169,3 +169,7 @@ void headerJSON(FILE *stream, struct per_transfer *per)
   }
   fputs("\n}", stream);
 }
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif

diff --git a/tests/libtest/lib1945.c b/tests/libtest/lib1945.c
index 8cbb01ec6ce16760dbf2f57699adbb6f274af141..59db5540f337116563771ca8ff3e2b9f53d6af77 100644 (file)
--- a/tests/libtest/lib1945.c
+++ b/tests/libtest/lib1945.c
@@ -27,8 +27,8 @@
 #include "memdebug.h"
 
 #ifdef _MSC_VER
-/* warning C4706: assignment within conditional expression */
-#pragma warning(disable:4706)
+#pragma warning(push)
+#pragma warning(disable:4706) /* assignment within conditional expression */
 #endif
 static void showem(CURL *easy, unsigned int type)
 {
@@ -41,6 +41,9 @@ static void showem(CURL *easy, unsigned int type)
     prev = header;
   }
 }
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 static size_t write_cb(char *data, size_t n, size_t l, void *userp)
 {