moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-01 01:41:50 -05:00
Code Issues Releases Wiki Activity

Compiler warning fix

Browse Source
This commit is contained in:
Yang Tse 2006-09-09 13:24:42 +00:00
parent b0f6e7cee4
commit bb87b65f08
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ftp.c
View File

@ -850,7 +850,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
return CURLE_FTP_PORT_FAILED; return CURLE_FTP_PORT_FAILED;
} }
if (sslen > sizeof(ss)) if (sslen > (socklen_t)sizeof(ss))
sslen = sizeof(ss); sslen = sizeof(ss);
rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL, rc = getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf), NULL,
0, NIFLAGS); 0, NIFLAGS);
@ -918,7 +918,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
else else
((struct sockaddr_in6 *)sa)->sin6_port =0; ((struct sockaddr_in6 *)sa)->sin6_port =0;
if (sslen > sizeof(ss)) if (sslen > (socklen_t)sizeof(ss))
sslen = sizeof(ss); sslen = sizeof(ss);
if(bind(portsock, (struct sockaddr *)sa, sslen)) { if(bind(portsock, (struct sockaddr *)sa, sslen)) {
@ -1088,7 +1088,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
Curl_strerror(conn, Curl_sockerrno()) ); Curl_strerror(conn, Curl_sockerrno()) );
return CURLE_FTP_PORT_FAILED; return CURLE_FTP_PORT_FAILED;
} }
if (sslen>sizeof(sa)) if (sslen > (socklen_t)sizeof(sa))
sslen = sizeof(sa); sslen = sizeof(sa);
sa_filled_in = TRUE; /* the sa struct is filled in */ sa_filled_in = TRUE; /* the sa struct is filled in */

6
lib/multi.c
View File

@ -188,7 +188,7 @@ static void multistate(struct Curl_one_easy *easy, CURLMstate state)
"CANCELLED" "CANCELLED"
}; };
CURLMstate oldstate = easy->state; CURLMstate oldstate = easy->state;
int index = -1; long index = -1;
#endif #endif
easy->state = state; easy->state = state;
@ -199,7 +199,7 @@ static void multistate(struct Curl_one_easy *easy, CURLMstate state)
index = easy->easy_conn->connectindex; index = easy->easy_conn->connectindex;
infof(easy->easy_handle, infof(easy->easy_handle,
"STATE: %s => %s handle %p; (connection #%d) \n", "STATE: %s => %s handle %p; (connection #%ld) \n",
statename[oldstate], statename[easy->state], statename[oldstate], statename[easy->state],
(char *)easy, index); (char *)easy, index);
#endif #endif
@ -1554,7 +1554,7 @@ CURLMcode curl_multi_setopt(CURLM *multi_handle,
multi->socket_userp = va_arg(param, void *); multi->socket_userp = va_arg(param, void *);
break; break;
case CURLMOPT_PIPELINING: case CURLMOPT_PIPELINING:
multi->pipelining_enabled = va_arg(param, long); multi->pipelining_enabled = (bool)(0 != va_arg(param, long));
break; break;
default: default:
res = CURLM_UNKNOWN_OPTION; res = CURLM_UNKNOWN_OPTION;