forked from enlightenment/efl
efl: Fix shadow warnings
Signed-off-by: Mike McCormack <mikem@atratus.org> SVN revision: 82013
This commit is contained in:
parent
8d1f3f7851
commit
81cf390f17
|
@ -949,6 +949,7 @@ void dns_p_dictadd(struct dns_packet *P, unsigned short dn) {
|
||||||
int dns_p_push(struct dns_packet *P, enum dns_section section, const void *dn, size_t dnlen, enum dns_type type, enum dns_class class, unsigned ttl, const void *any) {
|
int dns_p_push(struct dns_packet *P, enum dns_section section, const void *dn, size_t dnlen, enum dns_type type, enum dns_class class, unsigned ttl, const void *any) {
|
||||||
size_t end = P->end;
|
size_t end = P->end;
|
||||||
int error;
|
int error;
|
||||||
|
unsigned short count;
|
||||||
|
|
||||||
if ((error = dns_d_push(P, dn, dnlen)))
|
if ((error = dns_d_push(P, dn, dnlen)))
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -985,7 +986,8 @@ update:
|
||||||
if (!P->qd.base && (error = dns_p_study(P)))
|
if (!P->qd.base && (error = dns_p_study(P)))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
dns_header(P)->qdcount = htons(ntohs(dns_header(P)->qdcount) + 1);
|
count = ntohs(dns_header(P)->qdcount) + 1;
|
||||||
|
dns_header(P)->qdcount = htons(count);
|
||||||
|
|
||||||
P->qd.end = P->end;
|
P->qd.end = P->end;
|
||||||
P->an.base = P->end;
|
P->an.base = P->end;
|
||||||
|
@ -1003,7 +1005,8 @@ update:
|
||||||
if (!P->an.base && (error = dns_p_study(P)))
|
if (!P->an.base && (error = dns_p_study(P)))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
dns_header(P)->ancount = htons(ntohs(dns_header(P)->ancount) + 1);
|
count = ntohs(dns_header(P)->ancount) + 1;
|
||||||
|
dns_header(P)->ancount = htons(count);
|
||||||
|
|
||||||
P->an.end = P->end;
|
P->an.end = P->end;
|
||||||
P->ns.base = P->end;
|
P->ns.base = P->end;
|
||||||
|
@ -1019,7 +1022,8 @@ update:
|
||||||
if (!P->ns.base && (error = dns_p_study(P)))
|
if (!P->ns.base && (error = dns_p_study(P)))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
dns_header(P)->nscount = htons(ntohs(dns_header(P)->nscount) + 1);
|
count = ntohs(dns_header(P)->nscount) + 1;
|
||||||
|
dns_header(P)->nscount = htons(count);
|
||||||
|
|
||||||
P->ns.end = P->end;
|
P->ns.end = P->end;
|
||||||
P->ar.base = P->end;
|
P->ar.base = P->end;
|
||||||
|
@ -1030,7 +1034,8 @@ update:
|
||||||
if (!P->ar.base && (error = dns_p_study(P)))
|
if (!P->ar.base && (error = dns_p_study(P)))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
dns_header(P)->arcount = htons(ntohs(dns_header(P)->arcount) + 1);
|
count = ntohs(dns_header(P)->arcount) + 1;
|
||||||
|
dns_header(P)->arcount = ntohs(dns_header(P)->arcount) + 1;
|
||||||
|
|
||||||
P->ar.end = P->end;
|
P->ar.end = P->end;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue