diff options
author | Daniel Stenberg <daniel@haxx.se> | 2009-10-29 08:50:34 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2009-10-29 08:50:34 +0000 |
commit | 9ff3cb7411dc659bddd0c8a37ea07c3737a74664 (patch) | |
tree | 7ce5f78861283fb261f49ddff4bcaa0839080eea | |
parent | 991c93cf5404c9143313fac15d784496c25ba8ed (diff) | |
download | c-ares-9ff3cb7411dc659bddd0c8a37ea07c3737a74664.tar.gz c-ares-9ff3cb7411dc659bddd0c8a37ea07c3737a74664.tar.bz2 c-ares-9ff3cb7411dc659bddd0c8a37ea07c3737a74664.zip |
use 'ares_srv_reply' for proper name-spacing
-rw-r--r-- | ares.h | 4 | ||||
-rw-r--r-- | ares_parse_srv_reply.c | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -429,7 +429,7 @@ struct addr6ttl { int ttl; }; -struct srv_reply { +struct ares_srv_reply { unsigned short weight; unsigned short priority; 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, int alen, - struct srv_reply** srv_out, + struct ares_srv_reply** srv_out, int *nsrvreply); CARES_EXTERN void ares_free_string(void *str); diff --git a/ares_parse_srv_reply.c b/ares_parse_srv_reply.c index c26d59f..b0e15eb 100644 --- a/ares_parse_srv_reply.c +++ b/ares_parse_srv_reply.c @@ -54,14 +54,14 @@ int 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; const unsigned char *aptr; int status, i, rr_type, rr_class, rr_len; long len; 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. */ if (srv_out) @@ -95,8 +95,8 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen, } aptr += len + QFIXEDSZ; - /* Allocate srv_reply array; ancount gives an upper bound */ - srv = malloc ((ancount) * sizeof (struct srv_reply)); + /* Allocate ares_srv_reply array; ancount gives an upper bound */ + srv = malloc ((ancount) * sizeof (struct ares_srv_reply)); if (!srv) { free (hostname); |