Commit 5cdbd0cf authored by Gisle Vanem's avatar Gisle Vanem
Browse files

Constify arguments to Curl_he2ai() and Curl_addrinfo_copy().

parent a55c70d4

lib/hostip.c

+2 −2
Original line number Diff line number Diff line
@@ -552,9 +552,9 @@ struct curl_hash *Curl_mk_dnscache(void) 
 * returns a pointer to the malloc()ed copy. You need to call free() on the

 * returned buffer when you're done with it.

 */

Curl_addrinfo *Curl_addrinfo_copy(void *org, int port)

Curl_addrinfo *Curl_addrinfo_copy(const void *org, int port)

{

  struct hostent *orig = org;

  const struct hostent *orig = org;



  return Curl_he2ai(orig, port);

}

lib/hostip.h

+2 −2
Original line number Diff line number Diff line
@@ -224,13 +224,13 @@ Curl_addrinfo *Curl_ip2addr(in_addr_t num, const 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 *, int port);

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



/* relocate a hostent struct */

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



/* Clone a Curl_addrinfo struct, works protocol independently */

Curl_addrinfo *Curl_addrinfo_copy(void *orig, int port);

Curl_addrinfo *Curl_addrinfo_copy(const void *orig, int port);



/*

 * Curl_printable_address() returns a printable version of the 1st address

lib/hostip4.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, 
 *     #define h_addr  h_addr_list[0]

 */



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

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

{

  Curl_addrinfo *ai;

  Curl_addrinfo *prevai = NULL;

lib/hostip6.c

+2 −2
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ void Curl_freeaddrinfo(Curl_addrinfo *p) 
 * address. But this is an ipv6 build and then we don't copy the address, we

 * just return the same pointer!

 */

Curl_addrinfo *Curl_addrinfo_copy(void *source, int port)

Curl_addrinfo *Curl_addrinfo_copy(const void *orig, int port)

{

  (void) port;

  return source;

  return (Curl_addrinfo*)orig;

}

#endif