fix a bunch of MSVC compiler warnings (6b75d2c2) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/asyn.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -146,15 +146,15 @@ Curl_addrinfo Curl_resolver_getaddrinfo(struct connectdata conn,

	#ifndef CURLRES_ASYNCH		#ifndef CURLRES_ASYNCH
	/* convert these functions if an asynch resolver isn't used */		/* convert these functions if an asynch resolver isn't used */
	#define Curl_resolver_cancel(x)		#define Curl_resolver_cancel(x) Curl_nop_stmt
	#define Curl_resolver_is_resolved(x,y) CURLE_COULDNT_RESOLVE_HOST		#define Curl_resolver_is_resolved(x,y) CURLE_COULDNT_RESOLVE_HOST
	#define Curl_resolver_wait_resolv(x,y) CURLE_COULDNT_RESOLVE_HOST		#define Curl_resolver_wait_resolv(x,y) CURLE_COULDNT_RESOLVE_HOST
	#define Curl_resolver_getsock(x,y,z) 0		#define Curl_resolver_getsock(x,y,z) 0
	#define Curl_resolver_duphandle(x,y) CURLE_OK		#define Curl_resolver_duphandle(x,y) CURLE_OK
	#define Curl_resolver_init(x) CURLE_OK		#define Curl_resolver_init(x) CURLE_OK
	#define Curl_resolver_global_init() CURLE_OK		#define Curl_resolver_global_init() CURLE_OK
	#define Curl_resolver_global_cleanup()		#define Curl_resolver_global_cleanup() Curl_nop_stmt
	#define Curl_resolver_cleanup(x)		#define Curl_resolver_cleanup(x) Curl_nop_stmt
	#endif		#endif

	#ifdef CURLRES_ASYNCH		#ifdef CURLRES_ASYNCH

lib/connect.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -790,7 +790,7 @@ static void nosigpipe(struct connectdata *conn,
	Curl_strerror(conn, SOCKERRNO));		Curl_strerror(conn, SOCKERRNO));
	}		}
	#else		#else
	#define nosigpipe(x,y)		#define nosigpipe(x,y) Curl_nop_stmt
	#endif		#endif

	#ifdef USE_WINSOCK		#ifdef USE_WINSOCK

lib/connect.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	* KIND, either express or implied.		* KIND, either express or implied.
	*		*
	***************************************************************************/		***************************************************************************/
			#include "setup.h"

	#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */		#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */

	@@ -64,7 +65,7 @@ curl_socket_t Curl_getconnectinfo(struct SessionHandle *data,
	*/		*/
	void Curl_sndbufset(curl_socket_t sockfd);		void Curl_sndbufset(curl_socket_t sockfd);
	#else		#else
	#define Curl_sndbufset(y)		#define Curl_sndbufset(y) Curl_nop_stmt
	#endif		#endif

	void Curl_updateconninfo(struct connectdata *conn, curl_socket_t sockfd);		void Curl_updateconninfo(struct connectdata *conn, curl_socket_t sockfd);

lib/content_encoding.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	#ifndef __CURL_CONTENT_ENCODING_H		#ifndef HEADER_CURL_CONTENT_ENCODING_H
	#define __CURL_CONTENT_ENCODING_H		#define HEADER_CURL_CONTENT_ENCODING_H
	/***************************************************************************		/***************************************************************************
	* _ _ ____ _		* _ _ ____ _
	* Project ___\| \| \| \| _ \\| \|		* Project ___\| \| \| \| _ \\| \|
	@@ -7,7 +7,7 @@
	* \| (__\| \|_\| \| _ <\| \|___		* \| (__\| \|_\| \| _ <\| \|___
	* \___\|\___/\|_\| \_\_____\|		* \___\|\___/\|_\| \_\_____\|
	*		*
	* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.		* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
	*		*
	* This software is licensed as described in the file COPYING, which		* This software is licensed as described in the file COPYING, which
	* you should have received as part of this distribution. The terms		* you should have received as part of this distribution. The terms
	@@ -32,7 +32,7 @@
	void Curl_unencode_cleanup(struct connectdata *conn);		void Curl_unencode_cleanup(struct connectdata *conn);
	#else		#else
	#define ALL_CONTENT_ENCODINGS "identity"		#define ALL_CONTENT_ENCODINGS "identity"
	#define Curl_unencode_cleanup(x)		#define Curl_unencode_cleanup(x) Curl_nop_stmt
	#endif		#endif

	CURLcode Curl_unencode_deflate_write(struct connectdata *conn,		CURLcode Curl_unencode_deflate_write(struct connectdata *conn,
	@@ -45,4 +45,4 @@ Curl_unencode_gzip_write(struct connectdata *conn,
	ssize_t nread);		ssize_t nread);


	#endif		#endif /* HEADER_CURL_CONTENT_ENCODING_H */

lib/cookie.h

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	* KIND, either express or implied.		* KIND, either express or implied.
	*		*
	***************************************************************************/		***************************************************************************/
			#include "setup.h"

	#include <curl/curl.h>		#include <curl/curl.h>

	@@ -86,10 +87,10 @@ void Curl_cookie_clearsess(struct CookieInfo *cookies);

	#if defined(CURL_DISABLE_HTTP) \|\| defined(CURL_DISABLE_COOKIES)		#if defined(CURL_DISABLE_HTTP) \|\| defined(CURL_DISABLE_COOKIES)
	#define Curl_cookie_list(x) NULL		#define Curl_cookie_list(x) NULL
	#define Curl_cookie_loadfiles(x) do { } while (0)		#define Curl_cookie_loadfiles(x) Curl_nop_stmt
	#define Curl_cookie_init(x,y,z,w) NULL		#define Curl_cookie_init(x,y,z,w) NULL
	#define Curl_cookie_cleanup(x) do { } while (0)		#define Curl_cookie_cleanup(x) Curl_nop_stmt
	#define Curl_flush_cookies(x,y)		#define Curl_flush_cookies(x,y) Curl_nop_stmt
	#else		#else
	void Curl_flush_cookies(struct SessionHandle *data, int cleanup);		void Curl_flush_cookies(struct SessionHandle *data, int cleanup);
	void Curl_cookie_cleanup(struct CookieInfo *);		void Curl_cookie_cleanup(struct CookieInfo *);