moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

make ares_expand_name() take a long * instead of an int *, since we do 

pointer arithmetic (ptr1 - ptr2) and to do that properly on 64bit we need
long
This commit is contained in:
Daniel Stenberg 2004-02-23 07:52:20 +00:00
parent 7174ca7a20
commit c7fe8a7a11
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ares/adig.c
View File

@ -370,7 +370,8 @@ static const unsigned char *display_question(const unsigned char *aptr,
int alen)
{
char *name;
int type, dnsclass, status, len;
int type, dnsclass, status;
long len;
/* Parse the question name. */
status = ares_expand_name(aptr, abuf, alen, &name, &len);
@ -408,7 +409,8 @@ static const unsigned char *display_rr(const unsigned char *aptr,
{
const unsigned char *p;
char *name;
int type, dnsclass, ttl, dlen, status, len;
int type, dnsclass, ttl, dlen, status;
long len;
struct in_addr addr;
/* Parse the RR name. */

2
ares/ares.h
View File

@ -117,7 +117,7 @@ void ares_process(ares_channel channel, fd_set *read_fds, fd_set *write_fds);
int ares_mkquery(const char *name, int dnsclass, int type, unsigned short id,
int rd, unsigned char **buf, int *buflen);
int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
int alen, char **s, int *enclen);
int alen, char **s, long *enclen);
int ares_parse_a_reply(const unsigned char *abuf, int alen,
struct hostent **host);
int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,

2
ares/ares_expand_name.c
View File

@ -54,7 +54,7 @@ static int name_length(const unsigned char *encoded, const unsigned char *abuf,
*/
int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
int alen, char **s, int *enclen)
int alen, char **s, long *enclen)
{
int len, indir = 0;
char *q;

3
ares/ares_parse_a_reply.c
View File

@ -35,8 +35,9 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
struct hostent **host)
{
unsigned int qdcount, ancount;
int status, i, len, rr_type, rr_class, rr_len, naddrs;
int status, i, rr_type, rr_class, rr_len, naddrs;
int naliases;
long len;
const unsigned char *aptr;
char *hostname, *rr_name, *rr_data, **aliases;
struct in_addr *addrs;

3
ares/ares_parse_ptr_reply.c
View File

@ -34,7 +34,8 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
int addrlen, int family, struct hostent **host)
{
unsigned int qdcount, ancount;
int status, i, len, rr_type, rr_class, rr_len;
int status, i, rr_type, rr_class, rr_len;
long len;
const unsigned char *aptr;
char *ptrname, *hostname, *rr_name, *rr_data;
struct hostent *hostent;

2
ares/ares_process.c
View File

@ -525,7 +525,7 @@ static int same_questions(const unsigned char *qbuf, int qlen,
const unsigned char *p;
int qdcount;
char *name;
int namelen;
long namelen;
int type;
int dnsclass;
} q, a;