fix several compiler warnings (3c80309c) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/base64.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		@@ -58,11 +58,11 @@ static void decodeQuantum(unsigned char dest, const char src)
		x = (x << 6);
		}

		dest[2] = curlx_ultouc(x);
		dest[2] = curlx_ultouc(x & 0xFFUL);
		x >>= 8;
		dest[1] = curlx_ultouc(x);
		dest[1] = curlx_ultouc(x & 0xFFUL);
		x >>= 8;
		dest[0] = curlx_ultouc(x);
		dest[0] = curlx_ultouc(x & 0xFFUL);
		}

		/*

lib/http_digest.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		@@ -34,6 +34,7 @@
		#include "url.h" /* for Curl_safefree() */
		#include "curl_memory.h"
		#include "non-ascii.h" /* included for Curl_convert_... prototypes */
		#include "warnless.h"

		#define _MPRINTF_REPLACE /* use our functions only */
		#include <curl/mprintf.h>
		@@ -416,7 +417,8 @@ CURLcode Curl_output_digest(struct connectdata *conn,
		*/
		if(authp->iestyle && ((tmp = strchr((char *)uripath, '?')) != NULL)) {
		md5this = (unsigned char )aprintf("%s:%.s", request,
		(int)(tmp - (char *)uripath), uripath);
		curlx_sztosi(tmp - (char *)uripath),
		uripath);
		}
		else
		md5this = (unsigned char *)aprintf("%s:%s", request, uripath);

lib/ssh.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@
		have their definition hidden well */
		#endif

		#define sftp_libssh2_realpath(s,p,t,m) \
		libssh2_sftp_symlink_ex((s), (p), curlx_uztoui(strlen(p)), \
		(t), (m), LIBSSH2_SFTP_REALPATH)

		/* Local functions: */
		static const char *sftp_libssh2_strerror(unsigned long err);
		static LIBSSH2_ALLOC_FUNC(my_libssh2_malloc);
		@@ -982,7 +986,7 @@ static CURLcode ssh_statemach_act(struct connectdata conn, bool block)
		/*
		* Get the "home" directory
		*/
		rc = libssh2_sftp_realpath(sshc->sftp_session, ".",
		rc = sftp_libssh2_realpath(sshc->sftp_session, ".",
		tempHome, PATH_MAX-1);
		if(rc == LIBSSH2_ERROR_EAGAIN) {
		break;

lib/ssluse.c

+10 −7

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@
		static char global_passwd[64];
		#endif

		static int passwd_callback(char *buf, int num, int verify
		static int passwd_callback(char *buf, int num, int encrypting
		#ifdef HAVE_USERDATA_IN_PWD_CALLBACK
		/* This was introduced in 0.9.4, we can set this
		using SSL_CTX_set_default_passwd_cb_userdata()
		@@ -154,12 +154,13 @@ static int passwd_callback(char *buf, int num, int verify
		#endif
		)
		{
		if(verify)
		fprintf(stderr, "%s\n", buf);
		else {
		if(num > (int)strlen((char *)global_passwd)) {
		strcpy(buf, global_passwd);
		return (int)strlen(buf);
		DEBUGASSERT(0 == encrypting);

		if(!encrypting) {
		int klen = curlx_uztosi(strlen((char *)global_passwd));
		if(num > klen) {
		memcpy(buf, global_passwd, klen+1);
		return klen;
		}
		}
		return 0;
		@@ -339,6 +340,8 @@ int cert_stuff(struct connectdata *conn,
		size_t len = strlen(data->set.str[STRING_KEY_PASSWD]);
		if(len < sizeof(global_passwd))
		memcpy(global_passwd, data->set.str[STRING_KEY_PASSWD], len+1);
		else
		global_passwd[0] = '\0';
		#else
		/*
		* We set the password in the callback userdata

lib/warnless.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,7 @@ unsigned short curlx_ultous(unsigned long ulnum)
		# pragma warning(disable:810) /* conversion may lose significant bits */
		#endif

		DEBUGASSERT(ulnum <= (unsigned long) CURL_MASK_USHORT);
		return (unsigned short)(ulnum & (unsigned long) CURL_MASK_USHORT);

		#ifdef __INTEL_COMPILER
		@@ -149,6 +150,7 @@ unsigned char curlx_ultouc(unsigned long ulnum)
		# pragma warning(disable:810) /* conversion may lose significant bits */
		#endif

		DEBUGASSERT(ulnum <= (unsigned long) CURL_MASK_UCHAR);
		return (unsigned char)(ulnum & (unsigned long) CURL_MASK_UCHAR);

		#ifdef __INTEL_COMPILER
		@@ -167,6 +169,7 @@ int curlx_uztosi(size_t uznum)
		# pragma warning(disable:810) /* conversion may lose significant bits */
		#endif

		DEBUGASSERT(uznum <= (size_t) CURL_MASK_SINT);
		return (int)(uznum & (size_t) CURL_MASK_SINT);

		#ifdef __INTEL_COMPILER
		@@ -224,6 +227,7 @@ int curlx_sltosi(long slnum)
		#endif

		DEBUGASSERT(slnum >= 0);
		DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_SINT);
		return (int)(slnum & (long) CURL_MASK_SINT);

		#ifdef __INTEL_COMPILER
		@@ -243,6 +247,7 @@ unsigned int curlx_sltoui(long slnum)
		#endif

		DEBUGASSERT(slnum >= 0);
		DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_UINT);
		return (unsigned int)(slnum & (long) CURL_MASK_UINT);

		#ifdef __INTEL_COMPILER
		@@ -262,6 +267,7 @@ unsigned short curlx_sltous(long slnum)
		#endif

		DEBUGASSERT(slnum >= 0);
		DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_USHORT);
		return (unsigned short)(slnum & (long) CURL_MASK_USHORT);

		#ifdef __INTEL_COMPILER
		@@ -280,6 +286,7 @@ ssize_t curlx_uztosz(size_t uznum)
		# pragma warning(disable:810) /* conversion may lose significant bits */
		#endif

		DEBUGASSERT(uznum <= (size_t) CURL_MASK_SSIZE_T);
		return (ssize_t)(uznum & (size_t) CURL_MASK_SSIZE_T);

		#ifdef __INTEL_COMPILER
		@@ -318,6 +325,7 @@ int curlx_sztosi(ssize_t sznum)
		#endif

		DEBUGASSERT(sznum >= 0);
		DEBUGASSERT((size_t) sznum <= (size_t) CURL_MASK_SINT);
		return (int)(sznum & (ssize_t) CURL_MASK_SINT);

		#ifdef __INTEL_COMPILER