luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msvc: add missing push/pop for warning pragmas

Browse Source 
Also fix indentation/formatting around similar pragmas.

Closes #16101
This commit is contained in:
Viktor Szakats 2025-01-27 15:43:32 +01:00
parent 108b2153ac
commit 23b41224e3
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ftp.c
View File

@ -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)
{

2
lib/ldap.c
View File

@ -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

3
lib/telnet.c
View File

@ -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)
{

2
lib/vtls/schannel.h
View File

@ -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

12
lib/warnless.c
View File

@ -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
}

8
src/tool_writeout_json.c
View File

@ -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

7
tests/libtest/lib1945.c
View File

@ -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)
{