From 5cdbd0cf4a23826b8f7b74bbc071afb6515e3aab Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Fri, 21 Jul 2006 06:21:46 +0000
Subject: [PATCH] Constify arguments to Curl_he2ai() and Curl_addrinfo_copy().
---
lib/hostip.c | 4 ++--
lib/hostip.h | 4 ++--
lib/hostip4.c | 2 +-
lib/hostip6.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/hostip.c b/lib/hostip.c
index 7146bb2bf..2deab34e4 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -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);
}
diff --git a/lib/hostip.h b/lib/hostip.h
index bd3b28dc5..72906ab32 100644
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -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
diff --git a/lib/hostip4.c b/lib/hostip4.c
index 627b0783a..c56f08a4e 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -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;
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 3d80166c1..7c17a1576 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -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