diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-12-13 13:53:54 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-12-13 13:53:54 +0000 |
commit | 1440ff002fb551eec469170476e25658c494e12a (patch) | |
tree | 5abc365d8da8cd8251a37b32ff785b99126bb99a /src | |
parent | 1666d180855bff77fb2eb9a1260f4d85576d20ec (diff) |
fix some stuff for gcc 2.95 compatibility
git-svn-id: file:///home/lennart/svn/public/nss-mdns/trunk@63 0ee8848e-81ea-0310-a63a-f631d1a40d77
Diffstat (limited to 'src')
-rw-r--r-- | src/dns.c | 7 | ||||
-rw-r--r-- | src/nss.c | 6 | ||||
-rw-r--r-- | src/query.c | 6 |
3 files changed, 12 insertions, 7 deletions
@@ -131,8 +131,8 @@ uint8_t *dns_packet_append_name_compressed(struct dns_packet *p, const char *nam } int dns_packet_check_valid(struct dns_packet *p) { - assert(p); uint16_t flags; + assert(p); if (p->size < 12) return -1; @@ -278,7 +278,10 @@ int dns_packet_consume_bytes(struct dns_packet *p, void *ret_data, size_t l) { } int dns_packet_consume_seek(struct dns_packet *p, size_t length) { - assert(p && length > 0); + assert(p && length >= 0); + + if (!length) + return 0; if (p->rindex + length > p->size) return -1; @@ -238,14 +238,14 @@ enum nss_status _nss_mdns_gethostbyaddr_r( int *errnop, int *h_errnop) { - *errnop = EINVAL; - *h_errnop = NO_RECOVERY; - struct userdata u; enum nss_status status = NSS_STATUS_UNAVAIL; int fd = -1, r; size_t address_length, index, astart; + *errnop = EINVAL; + *h_errnop = NO_RECOVERY; + u.count = 0; u.data_len = 0; diff --git a/src/query.c b/src/query.c index 5bd3ea3..b534433 100644 --- a/src/query.c +++ b/src/query.c @@ -276,10 +276,11 @@ static int domain_cmp(const char *a, const char *b) { } static int process_name_response(int fd, const char *name, usec_t timeout, void (*ipv4_func)(const ipv4_address_t *ipv4, void *userdata), void (*ipv6_func)(const ipv6_address_t *ipv6, void *userdata), void *userdata) { - assert(fd >= 0 && name && (ipv4_func || ipv6_func)); struct dns_packet *p = NULL; int done = 0; struct timeval end; + + assert(fd >= 0 && name && (ipv4_func || ipv6_func)); gettimeofday(&end, NULL); timeval_add(&end, timeout); @@ -430,11 +431,12 @@ finish: } static int process_reverse_response(int fd, const char *name, usec_t timeout, void (*name_func)(const char *name, void *userdata), void *userdata) { - assert(fd >= 0 && name && name_func); struct dns_packet *p = NULL; int done = 0; struct timeval end; + assert(fd >= 0 && name && name_func); + gettimeofday(&end, NULL); timeval_add(&end, timeout); |