moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

some annoying compilers warn about "(void)foo;" lines so we avoid them

This commit is contained in:
Daniel Stenberg 2004-02-09 08:34:19 +00:00
parent cc85f813d1
commit 3bdc883c93
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/connect.c
View File

@ -223,7 +223,6 @@ static CURLcode bindlocal(struct connectdata *conn,
* Select device to bind socket to * Select device to bind socket to
*************************************************************/ *************************************************************/
if (strlen(data->set.device)<255) { if (strlen(data->set.device)<255) {
struct sockaddr_in sa;
struct Curl_dns_entry *h=NULL; struct Curl_dns_entry *h=NULL;
size_t size; size_t size;
char myhost[256] = ""; char myhost[256] = "";
@ -282,7 +281,6 @@ static CURLcode bindlocal(struct connectdata *conn,
/* we don't need it anymore after this function has returned */ /* we don't need it anymore after this function has returned */
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
(void)sa; /* prevent compiler warning */
if( bind(sockfd, addr->ai_addr, addr->ai_addrlen) >= 0) { if( bind(sockfd, addr->ai_addr, addr->ai_addrlen) >= 0) {
/* we succeeded to bind */ /* we succeeded to bind */
struct sockaddr_in6 add; struct sockaddr_in6 add;
@ -295,21 +293,25 @@ static CURLcode bindlocal(struct connectdata *conn,
} }
} }
#else #else
memset((char *)&sa, 0, sizeof(sa)); {
memcpy((char *)&sa.sin_addr, addr->h_addr, addr->h_length); struct sockaddr_in sa;
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = in; memset((char *)&sa, 0, sizeof(sa));
sa.sin_port = 0; /* get any port */ memcpy((char *)&sa.sin_addr, addr->h_addr, addr->h_length);
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = in;
sa.sin_port = 0; /* get any port */
if( bind(sockfd, (struct sockaddr *)&sa, sizeof(sa)) >= 0) { if( bind(sockfd, (struct sockaddr *)&sa, sizeof(sa)) >= 0) {
/* we succeeded to bind */ /* we succeeded to bind */
struct sockaddr_in add; struct sockaddr_in add;
size = sizeof(add); size = sizeof(add);
if(getsockname(sockfd, (struct sockaddr *) &add, if(getsockname(sockfd, (struct sockaddr *) &add,
(socklen_t *)&size)<0) { (socklen_t *)&size)<0) {
failf(data, "getsockname() failed"); failf(data, "getsockname() failed");
return CURLE_HTTP_PORT_FAILED; return CURLE_HTTP_PORT_FAILED;
}
} }
} }
#endif #endif