Commit 5e34f3dc authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

made the Curl_he2ai() take the port number as an int intead, to avoid lots 

of typecasts all over
parent 0031d76f

lib/hostip.c

+1 −1
Original line number Diff line number Diff line
@@ -555,6 +555,6 @@ Curl_addrinfo *Curl_addrinfo_copy(void *org, int port) 
{

  struct hostent *orig = org;



  return Curl_he2ai(orig, (unsigned short)port);

  return Curl_he2ai(orig, port);

}

#endif /* CURLRES_ADDRINFO_COPY */

lib/hostip.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ Curl_addrinfo *Curl_ip2addr(in_addr_t num, char *hostname, int port); 


/* [ipv4 only] Curl_he2ai() converts a struct hostent to a Curl_addrinfo chain

   and returns it */

Curl_addrinfo *Curl_he2ai(struct hostent *, unsigned short port);

Curl_addrinfo *Curl_he2ai(struct hostent *, int port);



/* relocate a hostent struct */

void Curl_hostent_relocate(struct hostent *h, long offset);

lib/hostip4.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ struct hostent { 


*/



Curl_addrinfo *Curl_he2ai(struct hostent *he, unsigned short port)

Curl_addrinfo *Curl_he2ai(struct hostent *he, int port)

{

  Curl_addrinfo *ai;

  Curl_addrinfo *prevai = NULL;

lib/hostthre.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, 
          hostname, port, Curl_strerror(conn,WSAGetLastError()));

    return NULL;

  }

  return Curl_he2ai(h, (unsigned short)port);

  return Curl_he2ai(h, port);

}

#endif /* CURLRES_IPV4 */