mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolver: style.

Browse Source 
Renamed argument in ngx_resolver_process_a() for consistency.
This commit is contained in:
Ruslan Ermilov 2015-12-17 17:21:12 +03:00
parent cbee15bb6c
commit 06806aa001
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/ngx_resolver.c
View File

@ -1738,7 +1738,7 @@ dns_error:
static void static void
ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last, ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t n,
ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype, ngx_uint_t ident, ngx_uint_t code, ngx_uint_t qtype,
ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans) ngx_uint_t nan, ngx_uint_t trunc, ngx_uint_t ans)
{ {
@ -1750,7 +1750,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
in_addr_t *addr; in_addr_t *addr;
ngx_str_t name; ngx_str_t name;
ngx_addr_t *addrs; ngx_addr_t *addrs;
ngx_uint_t type, class, qident, naddrs, a, i, n, start; ngx_uint_t type, class, qident, naddrs, a, i, j, start;
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
struct in6_addr *addr6; struct in6_addr *addr6;
#endif #endif
@ -1760,7 +1760,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
ngx_resolver_connection_t *rec; ngx_resolver_connection_t *rec;
if (ngx_resolver_copy(r, &name, buf, if (ngx_resolver_copy(r, &name, buf,
buf + sizeof(ngx_resolver_hdr_t), buf + last) buf + sizeof(ngx_resolver_hdr_t), buf + n)
!= NGX_OK) != NGX_OK)
{ {
return; return;
@ -1966,7 +1966,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
start = i; start = i;
while (i < last) { while (i < n) {
if (buf[i] & 0xc0) { if (buf[i] & 0xc0) {
i += 2; i += 2;
@ -1992,7 +1992,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
found: found:
if (i + sizeof(ngx_resolver_an_t) >= last) { if (i + sizeof(ngx_resolver_an_t) >= n) {
goto short_response; goto short_response;
} }
@ -2032,7 +2032,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
goto invalid; goto invalid;
} }
if (i + 4 > last) { if (i + 4 > n) {
goto short_response; goto short_response;
} }
@ -2053,7 +2053,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
goto invalid; goto invalid;
} }
if (i + 16 > last) { if (i + 16 > n) {
goto short_response; goto short_response;
} }
@ -2134,7 +2134,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
#endif #endif
} }
n = 0; j = 0;
i = ans; i = ans;
for (a = 0; a < nan; a++) { for (a = 0; a < nan; a++) {
@ -2163,10 +2163,10 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
if (type == NGX_RESOLVE_A) { if (type == NGX_RESOLVE_A) {
addr[n] = htonl((buf[i] << 24) + (buf[i + 1] << 16) addr[j] = htonl((buf[i] << 24) + (buf[i + 1] << 16)
+ (buf[i + 2] << 8) + (buf[i + 3])); + (buf[i + 2] << 8) + (buf[i + 3]));
if (++n == naddrs) { if (++j == naddrs) {
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
if (rn->naddrs6 == (u_short) -1) { if (rn->naddrs6 == (u_short) -1) {
@ -2181,9 +2181,9 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
else if (type == NGX_RESOLVE_AAAA) { else if (type == NGX_RESOLVE_AAAA) {
ngx_memcpy(addr6[n].s6_addr, &buf[i], 16); ngx_memcpy(addr6[j].s6_addr, &buf[i], 16);
if (++n == naddrs) { if (++j == naddrs) {
if (rn->naddrs == (u_short) -1) { if (rn->naddrs == (u_short) -1) {
goto next; goto next;
@ -2308,7 +2308,7 @@ ngx_resolver_process_a(ngx_resolver_t *r, u_char *buf, size_t last,
goto next; goto next;
} }
if (ngx_resolver_copy(r, &name, buf, cname, buf + last) != NGX_OK) { if (ngx_resolver_copy(r, &name, buf, cname, buf + n) != NGX_OK) {
goto failed; goto failed;
} }