diff options
| -rw-r--r-- | lib/hostares.c | 4 | ||||
| -rw-r--r-- | lib/hostip.c | 8 | ||||
| -rw-r--r-- | lib/hostip.h | 10 | ||||
| -rw-r--r-- | lib/hostip4.c | 4 | ||||
| -rw-r--r-- | lib/hostip6.c | 4 | ||||
| -rw-r--r-- | lib/hostthre.c | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/lib/hostares.c b/lib/hostares.c index f08ad5859..af1513ca2 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -259,7 +259,7 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn, * Curl_freeaddrinfo(), nothing else. */ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - char *hostname, + const char *hostname, int port, int *waitp) { @@ -314,7 +314,7 @@ struct namebuf { * The input parameters ARE NOT checked for validity but they are expected * to have been checked already when this is called. */ -Curl_addrinfo *Curl_ip2addr(in_addr_t num, char *hostname, int port) +Curl_addrinfo *Curl_ip2addr(in_addr_t num, const char *hostname, int port) { Curl_addrinfo *ai; struct hostent *h; diff --git a/lib/hostip.c b/lib/hostip.c index 21d2297fa..7146bb2bf 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -196,7 +196,7 @@ const char *Curl_printable_address(const Curl_addrinfo *ip, * the DNS caching. */ static char * -create_hostcache_id(char *server, int port) +create_hostcache_id(const char *server, int port) { /* create and return the new allocated entry */ return aprintf("%s:%d", server, port); @@ -327,7 +327,7 @@ sigjmp_buf curl_jmpenv; struct Curl_dns_entry * Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr, - char *hostname, + const char *hostname, int port) { char *entry_id; @@ -344,7 +344,7 @@ Curl_cache_addr(struct SessionHandle *data, entry_len = strlen(entry_id); /* Create a new cache entry */ - dns = (struct Curl_dns_entry *) malloc(sizeof(struct Curl_dns_entry)); + dns = (struct Curl_dns_entry *) calloc(sizeof(struct Curl_dns_entry), 1); if (!dns) { free(entry_id); return NULL; @@ -394,7 +394,7 @@ Curl_cache_addr(struct SessionHandle *data, */ int Curl_resolv(struct connectdata *conn, - char *hostname, + const char *hostname, int port, struct Curl_dns_entry **entry) { diff --git a/lib/hostip.h b/lib/hostip.h index 2205aac08..bd3b28dc5 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -135,7 +135,7 @@ struct Curl_dns_entry { #define CURLRESOLV_ERROR -1 #define CURLRESOLV_RESOLVED 0 #define CURLRESOLV_PENDING 1 -int Curl_resolv(struct connectdata *conn, char *hostname, +int Curl_resolv(struct connectdata *conn, const char *hostname, int port, struct Curl_dns_entry **dnsentry); /* @@ -151,7 +151,7 @@ bool Curl_ipvalid(struct SessionHandle *data); * of arguments */ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - char *hostname, + const char *hostname, int port, int *waitp); @@ -192,7 +192,7 @@ int Curl_num_addresses (const Curl_addrinfo *addr); #ifdef CURLDEBUG void curl_dofreeaddrinfo(struct addrinfo *freethis, int line, const char *source); -int curl_dogetaddrinfo(char *hostname, char *service, +int curl_dogetaddrinfo(const char *hostname, const char *service, struct addrinfo *hints, struct addrinfo **result, int line, const char *source); @@ -220,7 +220,7 @@ CURLcode Curl_addrinfo6_callback(void *arg, /* [ipv4 only] Creates a Curl_addrinfo struct from a numerical-only IP address */ -Curl_addrinfo *Curl_ip2addr(in_addr_t num, char *hostname, int port); +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 */ @@ -247,7 +247,7 @@ const char *Curl_printable_address(const Curl_addrinfo *ip, */ struct Curl_dns_entry * Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr, - char *hostname, int port); + const char *hostname, int port); /* * Curl_destroy_thread_data() cleans up async resolver data. diff --git a/lib/hostip4.c b/lib/hostip4.c index e55eb38d8..627b0783a 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -139,7 +139,7 @@ struct namebuf { * The input parameters ARE NOT checked for validity but they are expected * to have been checked already when this is called. */ -Curl_addrinfo *Curl_ip2addr(in_addr_t num, char *hostname, int port) +Curl_addrinfo *Curl_ip2addr(in_addr_t num, const char *hostname, int port) { Curl_addrinfo *ai; struct hostent *h; @@ -185,7 +185,7 @@ Curl_addrinfo *Curl_ip2addr(in_addr_t num, char *hostname, int port) * */ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - char *hostname, + const char *hostname, int port, int *waitp) { diff --git a/lib/hostip6.c b/lib/hostip6.c index b013ee902..3d80166c1 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -116,7 +116,7 @@ Curl_addrinfo *Curl_addrinfo_copy(void *source, int port) * family otherwise present in memdebug.c. I put these ones here since they * require a bunch of structs I didn't wanna include in memdebug.c */ -int curl_dogetaddrinfo(char *hostname, char *service, +int curl_dogetaddrinfo(const char *hostname, const char *service, struct addrinfo *hints, struct addrinfo **result, int line, const char *source) @@ -222,7 +222,7 @@ static void dump_addrinfo(struct connectdata *conn, const struct addrinfo *ai) * Curl_freeaddrinfo(), nothing else. */ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - char *hostname, + const char *hostname, int port, int *waitp) { diff --git a/lib/hostthre.c b/lib/hostthre.c index 8162794e6..65c09372e 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -726,7 +726,7 @@ int Curl_resolv_getsock(struct connectdata *conn, * Curl_getaddrinfo() - for Windows threading without ENABLE_IPV6. */ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - char *hostname, + const char *hostname, int port, int *waitp) { @@ -766,7 +766,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, * Curl_getaddrinfo() - for Windows threading IPv6 enabled */ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - char *hostname, + const char *hostname, int port, int *waitp) { |