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

use 'ares_srv_reply' for proper name-spacing

This commit is contained in:
Daniel Stenberg 2009-10-29 08:50:34 +00:00
parent 308497ffc6
commit 982e655c07
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ares/ares.h
View File

@ -429,7 +429,7 @@ struct addr6ttl {
int ttl; int ttl;
}; };
struct srv_reply { struct ares_srv_reply {
unsigned short weight; unsigned short weight;
unsigned short priority; unsigned short priority;
unsigned short port; unsigned short port;
@ -469,7 +469,7 @@ CARES_EXTERN int ares_parse_ns_reply(const unsigned char *abuf,
CARES_EXTERN int ares_parse_srv_reply(const unsigned char* abuf, CARES_EXTERN int ares_parse_srv_reply(const unsigned char* abuf,
int alen, int alen,
struct srv_reply** srv_out, struct ares_srv_reply** srv_out,
int *nsrvreply); int *nsrvreply);
CARES_EXTERN void ares_free_string(void *str); CARES_EXTERN void ares_free_string(void *str);

8
ares/ares_parse_srv_reply.c
View File

@ -54,14 +54,14 @@
int int
ares_parse_srv_reply (const unsigned char *abuf, int alen, ares_parse_srv_reply (const unsigned char *abuf, int alen,
struct srv_reply **srv_out, int *nsrvreply) struct ares_srv_reply **srv_out, int *nsrvreply)
{ {
unsigned int qdcount, ancount; unsigned int qdcount, ancount;
const unsigned char *aptr; const unsigned char *aptr;
int status, i, rr_type, rr_class, rr_len; int status, i, rr_type, rr_class, rr_len;
long len; long len;
char *hostname = NULL, *rr_name = NULL; char *hostname = NULL, *rr_name = NULL;
struct srv_reply *srv = NULL; struct ares_srv_reply *srv = NULL;
/* Set *srv_out to NULL for all failure cases. */ /* Set *srv_out to NULL for all failure cases. */
if (srv_out) if (srv_out)
@ -95,8 +95,8 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
} }
aptr += len + QFIXEDSZ; aptr += len + QFIXEDSZ;
/* Allocate srv_reply array; ancount gives an upper bound */ /* Allocate ares_srv_reply array; ancount gives an upper bound */
srv = malloc ((ancount) * sizeof (struct srv_reply)); srv = malloc ((ancount) * sizeof (struct ares_srv_reply));
if (!srv) if (!srv)
{ {
free (hostname); free (hostname);