generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compiler warning: implicit conversion shortens 64-bit value into a 32-bit value

Browse Source
This commit is contained in:
Yang Tse 2009-04-13 07:18:39 +00:00
parent aa330b8240
commit c621546bd6
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/curl_addrinfo.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2009, 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
@ -370,7 +370,7 @@ Curl_ip2addr(int af, const void *inaddr, const char *hostname, int port)
struct namebuff *buf; struct namebuff *buf;
char *addrentry; char *addrentry;
char *hoststr; char *hoststr;
int addrsize; size_t addrsize;
DEBUGASSERT(inaddr && hostname); DEBUGASSERT(inaddr && hostname);

12
lib/http_negotiate.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2009, 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
@ -140,7 +140,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER; gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER; gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
int ret; int ret;
size_t len; size_t len, rawlen;
bool gss; bool gss;
const char* protocol; const char* protocol;
@ -185,9 +185,9 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
len = strlen(header); len = strlen(header);
if(len > 0) { if(len > 0) {
int rawlen = Curl_base64_decode(header, rawlen = Curl_base64_decode(header,
(unsigned char **)&input_token.value); (unsigned char **)&input_token.value);
if(rawlen < 0) if(rawlen == 0)
return -1; return -1;
input_token.length = rawlen; input_token.length = rawlen;
@ -277,7 +277,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy)
struct negotiatedata *neg_ctx = proxy?&conn->data->state.proxyneg: struct negotiatedata *neg_ctx = proxy?&conn->data->state.proxyneg:
&conn->data->state.negotiate; &conn->data->state.negotiate;
char *encoded = NULL; char *encoded = NULL;
int len; size_t len;
#ifdef HAVE_SPNEGO /* Handle SPNEGO */ #ifdef HAVE_SPNEGO /* Handle SPNEGO */
if(checkprefix("Negotiate", neg_ctx->protocol)) { if(checkprefix("Negotiate", neg_ctx->protocol)) {

6
lib/ssluse.c
View File

@ -1044,7 +1044,7 @@ static CURLcode verifyhost(struct connectdata *conn,
{ {
bool matched = FALSE; /* no alternative match yet */ bool matched = FALSE; /* no alternative match yet */
int target = GEN_DNS; /* target type, GEN_DNS or GEN_IPADD */ int target = GEN_DNS; /* target type, GEN_DNS or GEN_IPADD */
int addrlen = 0; size_t addrlen = 0;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
STACK_OF(GENERAL_NAME) *altnames; STACK_OF(GENERAL_NAME) *altnames;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
@ -1087,7 +1087,7 @@ static CURLcode verifyhost(struct connectdata *conn,
if(check->type == target) { if(check->type == target) {
/* get data and length */ /* get data and length */
const char *altptr = (char *)ASN1_STRING_data(check->d.ia5); const char *altptr = (char *)ASN1_STRING_data(check->d.ia5);
int altlen; size_t altlen;
switch(target) { switch(target) {
case GEN_DNS: /* name/pattern comparison */ case GEN_DNS: /* name/pattern comparison */
@ -1108,7 +1108,7 @@ static CURLcode verifyhost(struct connectdata *conn,
case GEN_IPADD: /* IP address comparison */ case GEN_IPADD: /* IP address comparison */
/* compare alternative IP address if the data chunk is the same size /* compare alternative IP address if the data chunk is the same size
our server IP address is */ our server IP address is */
altlen = ASN1_STRING_length(check->d.ia5); altlen = (size_t) ASN1_STRING_length(check->d.ia5);
if((altlen == addrlen) && !memcmp(altptr, &addr, altlen)) if((altlen == addrlen) && !memcmp(altptr, &addr, altlen))
matched = TRUE; matched = TRUE;
break; break;

2
tests/libtest/lib556.c
View File

@ -55,7 +55,7 @@ int test(char *URL)
if(!res) { if(!res) {
/* we assume that sending always work */ /* we assume that sending always work */
int total=0; size_t total=0;
do { do {
/* busy-read like crazy */ /* busy-read like crazy */