diff options
| -rw-r--r-- | ares/ares_getnameinfo.c | 2 | ||||
| -rw-r--r-- | lib/hostip4.c | 6 | ||||
| -rw-r--r-- | lib/tftp.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c index 9c48e8f98..5499705b8 100644 --- a/ares/ares_getnameinfo.c +++ b/ares/ares_getnameinfo.c @@ -305,7 +305,7 @@ static char *lookup_service(unsigned short port, int flags, strcpy(tmpbuf, sep->s_name); else /* get port as a string */ - sprintf(tmpbuf, "%u", (unsigned short)ntohs(port)); + sprintf(tmpbuf, "%u", (unsigned int)ntohs(port)); if (strlen(tmpbuf) < buflen) /* return it if buffer big enough */ strcpy(buf, tmpbuf); diff --git a/lib/hostip4.c b/lib/hostip4.c index c4c6256d1..685156bad 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2007, 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 @@ -125,7 +125,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, int *waitp) { #if defined(HAVE_GETHOSTBYNAME_R_3) || defined(HAVE_GETHOSTBYNAME_R_6) - int res = ERANGE; + int res; #endif Curl_addrinfo *ai = NULL; struct hostent *h = NULL; @@ -380,7 +380,7 @@ Curl_addrinfo *Curl_he2ai(const struct hostent *he, int port) addr = (struct sockaddr_in *)ai->ai_addr; /* storage area for this info */ memcpy((char *)&(addr->sin_addr), curr, sizeof(struct in_addr)); - addr->sin_family = he->h_addrtype; + addr->sin_family = (unsigned short)(he->h_addrtype); addr->sin_port = htons((unsigned short)port); prevai = ai; diff --git a/lib/tftp.c b/lib/tftp.c index 9ec1a1512..2a28b0cb9 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -583,7 +583,7 @@ CURLcode Curl_tftp_connect(struct connectdata *conn, bool *done) state->state = TFTP_STATE_START; ((struct sockaddr *)&state->local_addr)->sa_family = - conn->ip_addr->ai_family; + (unsigned short)(conn->ip_addr->ai_family); tftp_set_timeouts(state); |