upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lint clean (svn:NO TEST)

Browse source 
git-svn-id: file:///svn/unbound/trunk@2836 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2013-02-07 13:34:14 +00:00
parent 90d55f8d82
commit 15ed732030
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libunbound/libworker.c
View file

@ -422,7 +422,7 @@ fill_res(struct ub_result* res, struct ub_packed_rrset_key* answer,
return 0; /* out of memory */ return 0; /* out of memory */
} }
if(rep->rrset_count != 0) if(rep->rrset_count != 0)
res->ttl = rep->ttl; res->ttl = (int)rep->ttl;
res->data = (char**)calloc(1, sizeof(char*)); res->data = (char**)calloc(1, sizeof(char*));
res->len = (int*)calloc(1, sizeof(int)); res->len = (int*)calloc(1, sizeof(int));
return (res->data && res->len); return (res->data && res->len);
@ -446,18 +446,18 @@ fill_res(struct ub_result* res, struct ub_packed_rrset_key* answer,
/* ttl for positive answers, from CNAME and answer RRs */ /* ttl for positive answers, from CNAME and answer RRs */
if(data->count != 0) { if(data->count != 0) {
size_t j; size_t j;
res->ttl = data->ttl; res->ttl = (int)data->ttl;
for(j=0; j<rep->an_numrrsets; j++) { for(j=0; j<rep->an_numrrsets; j++) {
struct packed_rrset_data* d = struct packed_rrset_data* d =
(struct packed_rrset_data*)rep->rrsets[j]-> (struct packed_rrset_data*)rep->rrsets[j]->
entry.data; entry.data;
if((int)d->ttl < res->ttl) if((int)d->ttl < res->ttl)
res->ttl = d->ttl; res->ttl = (int)d->ttl;
} }
} }
/* ttl for negative answers */ /* ttl for negative answers */
if(data->count == 0 && rep->rrset_count != 0) if(data->count == 0 && rep->rrset_count != 0)
res->ttl = rep->ttl; res->ttl = (int)rep->ttl;
res->data[data->count] = NULL; res->data[data->count] = NULL;
res->len[data->count] = 0; res->len[data->count] = 0;
return 1; return 1;