moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

fix several compiler warnings

Browse Source
This commit is contained in:
Yang Tse 2012-03-20 18:28:24 +01:00
parent e6a89cb6c4
commit c6825b7a6b
8 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/connect.c
View File

@ -93,7 +93,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error);
static void static void
tcpkeepalive(struct SessionHandle *data, tcpkeepalive(struct SessionHandle *data,
int sockfd) curl_socket_t sockfd)
{ {
int optval = data->set.tcp_keepalive?1:0; int optval = data->set.tcp_keepalive?1:0;
@ -104,14 +104,14 @@ tcpkeepalive(struct SessionHandle *data,
} }
else { else {
#ifdef TCP_KEEPIDLE #ifdef TCP_KEEPIDLE
optval = data->set.tcp_keepidle; optval = curlx_sltosi(data->set.tcp_keepidle);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPIDLE on fd %d\n", sockfd); infof(data, "Failed to set TCP_KEEPIDLE on fd %d\n", sockfd);
} }
#endif #endif
#ifdef TCP_KEEPINTVL #ifdef TCP_KEEPINTVL
optval = data->set.tcp_keepintvl; optval = curlx_sltosi(data->set.tcp_keepintvl);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL, if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
(void *)&optval, sizeof(optval)) < 0) { (void *)&optval, sizeof(optval)) < 0) {
infof(data, "Failed to set TCP_KEEPINTVL on fd %d\n", sockfd); infof(data, "Failed to set TCP_KEEPINTVL on fd %d\n", sockfd);

3
lib/md4.c
View File

@ -27,6 +27,7 @@
#ifdef USE_NSS #ifdef USE_NSS
#include "curl_md4.h" #include "curl_md4.h"
#include "warnless.h"
typedef unsigned int UINT4; typedef unsigned int UINT4;
@ -275,7 +276,7 @@ void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len)
{ {
MD4_CTX ctx; MD4_CTX ctx;
MD4Init(&ctx); MD4Init(&ctx);
MD4Update(&ctx, input, (unsigned int)len); MD4Update(&ctx, input, curlx_uztoui(len));
MD4Final(output, &ctx); MD4Final(output, &ctx);
} }
#endif /* USE_NSS */ #endif /* USE_NSS */

5
lib/md5.c
View File

@ -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 * 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
@ -26,6 +26,7 @@
#include "curl_md5.h" #include "curl_md5.h"
#include "curl_hmac.h" #include "curl_hmac.h"
#include "warnless.h"
#ifdef USE_GNUTLS_NETTLE #ifdef USE_GNUTLS_NETTLE
@ -412,7 +413,7 @@ void Curl_md5it(unsigned char *outbuffer, /* 16 bytes */
{ {
MD5_CTX ctx; MD5_CTX ctx;
MD5_Init(&ctx); MD5_Init(&ctx);
MD5_Update(&ctx, input, (unsigned int)strlen((char *)input)); MD5_Update(&ctx, input, curlx_uztoui(strlen((char *)input)));
MD5_Final(outbuffer, &ctx); MD5_Final(outbuffer, &ctx);
} }

4
lib/smtp.c
View File

@ -757,7 +757,7 @@ static CURLcode smtp_state_authcram_resp(struct connectdata *conn,
/* Compute digest. */ /* Compute digest. */
ctxt = Curl_HMAC_init(Curl_HMAC_MD5, ctxt = Curl_HMAC_init(Curl_HMAC_MD5,
(const unsigned char *) conn->passwd, (const unsigned char *) conn->passwd,
(unsigned int)(strlen(conn->passwd))); curlx_uztoui(strlen(conn->passwd)));
if(!ctxt) { if(!ctxt) {
Curl_safefree(chlg); Curl_safefree(chlg);
@ -765,7 +765,7 @@ static CURLcode smtp_state_authcram_resp(struct connectdata *conn,
} }
if(chlglen > 0) if(chlglen > 0)
Curl_HMAC_update(ctxt, chlg, (unsigned int)(chlglen)); Curl_HMAC_update(ctxt, chlg, curlx_uztoui(chlglen));
Curl_safefree(chlg); Curl_safefree(chlg);

50
lib/ssh.c
View File

@ -225,7 +225,7 @@ kbd_callback(const char *name, int name_len, const char *instruction,
#endif /* CURL_LIBSSH2_DEBUG */ #endif /* CURL_LIBSSH2_DEBUG */
if(num_prompts == 1) { if(num_prompts == 1) {
responses[0].text = strdup(conn->passwd); responses[0].text = strdup(conn->passwd);
responses[0].length = (unsigned int)strlen(conn->passwd); responses[0].length = curlx_uztoui(strlen(conn->passwd));
} }
(void)prompts; (void)prompts;
(void)abstract; (void)abstract;
@ -734,7 +734,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
*/ */
sshc->authlist = libssh2_userauth_list(sshc->ssh_session, sshc->authlist = libssh2_userauth_list(sshc->ssh_session,
conn->user, conn->user,
(unsigned int)strlen(conn->user)); curlx_uztoui(strlen(conn->user)));
if(!sshc->authlist) { if(!sshc->authlist) {
if((err = libssh2_session_last_errno(sshc->ssh_session)) == if((err = libssh2_session_last_errno(sshc->ssh_session)) ==
@ -827,8 +827,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
*/ */
rc = libssh2_userauth_publickey_fromfile_ex(sshc->ssh_session, rc = libssh2_userauth_publickey_fromfile_ex(sshc->ssh_session,
conn->user, conn->user,
(unsigned int) curlx_uztoui(
strlen(conn->user), strlen(conn->user)),
sshc->rsa_pub, sshc->rsa_pub,
sshc->rsa, sshc->passphrase); sshc->rsa, sshc->passphrase);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
@ -866,9 +866,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_AUTH_PASS: case SSH_AUTH_PASS:
rc = libssh2_userauth_password_ex(sshc->ssh_session, conn->user, rc = libssh2_userauth_password_ex(sshc->ssh_session, conn->user,
(unsigned int)strlen(conn->user), curlx_uztoui(strlen(conn->user)),
conn->passwd, conn->passwd,
(unsigned int)strlen(conn->passwd), curlx_uztoui(strlen(conn->passwd)),
NULL); NULL);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
@ -911,8 +911,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
/* Authentication failed. Continue with keyboard-interactive now. */ /* Authentication failed. Continue with keyboard-interactive now. */
rc = libssh2_userauth_keyboard_interactive_ex(sshc->ssh_session, rc = libssh2_userauth_keyboard_interactive_ex(sshc->ssh_session,
conn->user, conn->user,
(unsigned int) curlx_uztoui(
strlen(conn->user), strlen(conn->user)),
&kbd_callback); &kbd_callback);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
@ -1271,7 +1271,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
* first. This takes an extra protocol round trip. * first. This takes an extra protocol round trip.
*/ */
rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2, rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2,
(unsigned int)strlen(sshc->quote_path2), curlx_uztoui(strlen(sshc->quote_path2)),
LIBSSH2_SFTP_STAT, LIBSSH2_SFTP_STAT,
&sshc->quote_attrs); &sshc->quote_attrs);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
@ -1350,7 +1350,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_QUOTE_SETSTAT: case SSH_SFTP_QUOTE_SETSTAT:
rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2, rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2,
(unsigned int)strlen(sshc->quote_path2), curlx_uztoui(strlen(sshc->quote_path2)),
LIBSSH2_SFTP_SETSTAT, LIBSSH2_SFTP_SETSTAT,
&sshc->quote_attrs); &sshc->quote_attrs);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
@ -1374,9 +1374,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_QUOTE_SYMLINK: case SSH_SFTP_QUOTE_SYMLINK:
rc = libssh2_sftp_symlink_ex(sshc->sftp_session, sshc->quote_path1, rc = libssh2_sftp_symlink_ex(sshc->sftp_session, sshc->quote_path1,
(unsigned int)strlen(sshc->quote_path1), curlx_uztoui(strlen(sshc->quote_path1)),
sshc->quote_path2, sshc->quote_path2,
(unsigned int)strlen(sshc->quote_path2), curlx_uztoui(strlen(sshc->quote_path2)),
LIBSSH2_SFTP_SYMLINK); LIBSSH2_SFTP_SYMLINK);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
@ -1399,7 +1399,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_QUOTE_MKDIR: case SSH_SFTP_QUOTE_MKDIR:
rc = libssh2_sftp_mkdir_ex(sshc->sftp_session, sshc->quote_path1, rc = libssh2_sftp_mkdir_ex(sshc->sftp_session, sshc->quote_path1,
(unsigned int)strlen(sshc->quote_path1), curlx_uztoui(strlen(sshc->quote_path1)),
data->set.new_directory_perms); data->set.new_directory_perms);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
@ -1419,9 +1419,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_QUOTE_RENAME: case SSH_SFTP_QUOTE_RENAME:
rc = libssh2_sftp_rename_ex(sshc->sftp_session, sshc->quote_path1, rc = libssh2_sftp_rename_ex(sshc->sftp_session, sshc->quote_path1,
(unsigned int)strlen(sshc->quote_path1), curlx_uztoui(strlen(sshc->quote_path1)),
sshc->quote_path2, sshc->quote_path2,
(unsigned int)strlen(sshc->quote_path2), curlx_uztoui(strlen(sshc->quote_path2)),
LIBSSH2_SFTP_RENAME_OVERWRITE | LIBSSH2_SFTP_RENAME_OVERWRITE |
LIBSSH2_SFTP_RENAME_ATOMIC | LIBSSH2_SFTP_RENAME_ATOMIC |
LIBSSH2_SFTP_RENAME_NATIVE); LIBSSH2_SFTP_RENAME_NATIVE);
@ -1446,7 +1446,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_QUOTE_RMDIR: case SSH_SFTP_QUOTE_RMDIR:
rc = libssh2_sftp_rmdir_ex(sshc->sftp_session, sshc->quote_path1, rc = libssh2_sftp_rmdir_ex(sshc->sftp_session, sshc->quote_path1,
(unsigned int)strlen(sshc->quote_path1)); curlx_uztoui(strlen(sshc->quote_path1)));
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
} }
@ -1465,7 +1465,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_QUOTE_UNLINK: case SSH_SFTP_QUOTE_UNLINK:
rc = libssh2_sftp_unlink_ex(sshc->sftp_session, sshc->quote_path1, rc = libssh2_sftp_unlink_ex(sshc->sftp_session, sshc->quote_path1,
(unsigned int)strlen(sshc->quote_path1)); curlx_uztoui(strlen(sshc->quote_path1)));
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
} }
@ -1509,7 +1509,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
LIBSSH2_SFTP_ATTRIBUTES attrs; LIBSSH2_SFTP_ATTRIBUTES attrs;
if(data->state.resume_from < 0) { if(data->state.resume_from < 0) {
rc = libssh2_sftp_stat_ex(sshc->sftp_session, sftp_scp->path, rc = libssh2_sftp_stat_ex(sshc->sftp_session, sftp_scp->path,
(unsigned int)strlen(sftp_scp->path), curlx_uztoui(strlen(sftp_scp->path)),
LIBSSH2_SFTP_STAT, &attrs); LIBSSH2_SFTP_STAT, &attrs);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
@ -1540,7 +1540,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
sshc->sftp_handle = sshc->sftp_handle =
libssh2_sftp_open_ex(sshc->sftp_session, sftp_scp->path, libssh2_sftp_open_ex(sshc->sftp_session, sftp_scp->path,
(unsigned int)strlen(sftp_scp->path), curlx_uztoui(strlen(sftp_scp->path)),
flags, data->set.new_file_perms, flags, data->set.new_file_perms,
LIBSSH2_SFTP_OPENFILE); LIBSSH2_SFTP_OPENFILE);
@ -1699,7 +1699,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
case SSH_SFTP_CREATE_DIRS_MKDIR: case SSH_SFTP_CREATE_DIRS_MKDIR:
/* 'mode' - parameter is preliminary - default to 0644 */ /* 'mode' - parameter is preliminary - default to 0644 */
rc = libssh2_sftp_mkdir_ex(sshc->sftp_session, sftp_scp->path, rc = libssh2_sftp_mkdir_ex(sshc->sftp_session, sftp_scp->path,
(unsigned int)strlen(sftp_scp->path), curlx_uztoui(strlen(sftp_scp->path)),
data->set.new_directory_perms); data->set.new_directory_perms);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;
@ -1733,8 +1733,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
*/ */
sshc->sftp_handle = libssh2_sftp_open_ex(sshc->sftp_session, sshc->sftp_handle = libssh2_sftp_open_ex(sshc->sftp_session,
sftp_scp->path, sftp_scp->path,
(unsigned int) curlx_uztoui(
strlen(sftp_scp->path), strlen(sftp_scp->path)),
0, 0, LIBSSH2_SFTP_OPENDIR); 0, 0, LIBSSH2_SFTP_OPENDIR);
if(!sshc->sftp_handle) { if(!sshc->sftp_handle) {
if(libssh2_session_last_errno(sshc->ssh_session) == if(libssh2_session_last_errno(sshc->ssh_session) ==
@ -1875,7 +1875,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
sshc->readdir_len = sshc->readdir_len =
libssh2_sftp_symlink_ex(sshc->sftp_session, libssh2_sftp_symlink_ex(sshc->sftp_session,
sshc->readdir_linkPath, sshc->readdir_linkPath,
(unsigned int) strlen(sshc->readdir_linkPath), curlx_uztoui(strlen(sshc->readdir_linkPath)),
sshc->readdir_filename, sshc->readdir_filename,
PATH_MAX, LIBSSH2_SFTP_READLINK); PATH_MAX, LIBSSH2_SFTP_READLINK);
if(sshc->readdir_len == LIBSSH2_ERROR_EAGAIN) { if(sshc->readdir_len == LIBSSH2_ERROR_EAGAIN) {
@ -1961,7 +1961,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
*/ */
sshc->sftp_handle = sshc->sftp_handle =
libssh2_sftp_open_ex(sshc->sftp_session, sftp_scp->path, libssh2_sftp_open_ex(sshc->sftp_session, sftp_scp->path,
(unsigned int)strlen(sftp_scp->path), curlx_uztoui(strlen(sftp_scp->path)),
LIBSSH2_FXF_READ, data->set.new_file_perms, LIBSSH2_FXF_READ, data->set.new_file_perms,
LIBSSH2_SFTP_OPENFILE); LIBSSH2_SFTP_OPENFILE);
if(!sshc->sftp_handle) { if(!sshc->sftp_handle) {
@ -1988,7 +1988,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
LIBSSH2_SFTP_ATTRIBUTES attrs; LIBSSH2_SFTP_ATTRIBUTES attrs;
rc = libssh2_sftp_stat_ex(sshc->sftp_session, sftp_scp->path, rc = libssh2_sftp_stat_ex(sshc->sftp_session, sftp_scp->path,
(unsigned int)strlen(sftp_scp->path), curlx_uztoui(strlen(sftp_scp->path)),
LIBSSH2_SFTP_STAT, &attrs); LIBSSH2_SFTP_STAT, &attrs);
if(rc == LIBSSH2_ERROR_EAGAIN) { if(rc == LIBSSH2_ERROR_EAGAIN) {
break; break;

20
lib/warnless.c
View File

@ -185,6 +185,7 @@ unsigned long curlx_uztoul(size_t uznum)
# pragma warning(disable:810) /* conversion may lose significant bits */ # pragma warning(disable:810) /* conversion may lose significant bits */
#endif #endif
DEBUGASSERT(uznum <= (size_t) CURL_MASK_ULONG);
return (unsigned long)(uznum & (size_t) CURL_MASK_ULONG); return (unsigned long)(uznum & (size_t) CURL_MASK_ULONG);
#ifdef __INTEL_COMPILER #ifdef __INTEL_COMPILER
@ -192,6 +193,25 @@ unsigned long curlx_uztoul(size_t uznum)
#endif #endif
} }
/*
** unsigned size_t to unsigned int
*/
unsigned int curlx_uztoui(size_t uznum)
{
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:810) /* conversion may lose significant bits */
#endif
DEBUGASSERT(uznum <= (size_t) CURL_MASK_UINT);
return (unsigned int)(uznum & (size_t) CURL_MASK_UINT);
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
}
/* /*
** signed long to signed int ** signed long to signed int
*/ */

2
lib/warnless.h
View File

@ -30,6 +30,8 @@ int curlx_uztosi(size_t uznum);
unsigned long curlx_uztoul(size_t uznum); unsigned long curlx_uztoul(size_t uznum);
unsigned int curlx_uztoui(size_t uznum);
int curlx_sltosi(long slnum); int curlx_sltosi(long slnum);
unsigned int curlx_sltoui(long slnum); unsigned int curlx_sltoui(long slnum);

4
tests/libtest/testtrace.c
View File

@ -91,11 +91,13 @@ int libtest_debug_cb(CURL *handle, curl_infotype type,
struct timeval tv; struct timeval tv;
struct tm *now; struct tm *now;
char timebuf[20]; char timebuf[20];
char *timestr;
time_t secs; time_t secs;
(void)handle; (void)handle;
timebuf[0] = '\0'; timebuf[0] = '\0';
timestr = &timebuf[0];
if(trace_cfg->tracetime) { if(trace_cfg->tracetime) {
tv = tutil_tvnow(); tv = tutil_tvnow();
@ -111,7 +113,7 @@ int libtest_debug_cb(CURL *handle, curl_infotype type,
switch (type) { switch (type) {
case CURLINFO_TEXT: case CURLINFO_TEXT:
fprintf(stderr, "%s== Info: %s", &timebuf[0], data); fprintf(stderr, "%s== Info: %s", timestr, data);
default: /* in case a new one is introduced to shock us */ default: /* in case a new one is introduced to shock us */
return 0; return 0;