mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 00:25:29 +00:00
Code Issues Releases Wiki Activity

[master] change 'index' to avoid shadowed variable warning

Browse Source
This commit is contained in:
Evan Hunt
2017-05-03 12:36:54 -07:00
parent b497722f32
commit 8b8c2650b8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dns/compress.c
View File

@@ -232,7 +232,7 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name,
{ {
dns_name_t tname; dns_name_t tname;
dns_compressnode_t *node = NULL; dns_compressnode_t *node = NULL;
unsigned int labels, index, n; unsigned int labels, i, n;
unsigned int numlabels; unsigned int numlabels;
unsigned char *p; unsigned char *p;
@@ -266,11 +266,11 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name,
* character in the first label of the suffix name. * character in the first label of the suffix name.
*/ */
ch = p[1]; ch = p[1];
index = tableindex[ch]; i = tableindex[ch];
if (ISC_LIKELY((cctx->allowed & if (ISC_LIKELY((cctx->allowed &
DNS_COMPRESS_CASESENSITIVE) != 0)) DNS_COMPRESS_CASESENSITIVE) != 0))
{ {
for (node = cctx->table[index]; for (node = cctx->table[i];
node != NULL; node != NULL;
node = node->next) node = node->next)
{ {
@@ -282,7 +282,7 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name,
goto found; goto found;
} }
} else { } else {
for (node = cctx->table[index]; for (node = cctx->table[i];
node != NULL; node != NULL;
node = node->next) node = node->next)
{ {
@@ -375,7 +375,7 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name,
unsigned int start; unsigned int start;
unsigned int n; unsigned int n;
unsigned int count; unsigned int count;
unsigned int index; unsigned int i;
dns_compressnode_t *node; dns_compressnode_t *node;
unsigned int length; unsigned int length;
unsigned int tlength; unsigned int tlength;
@@ -425,7 +425,7 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name,
* character in the first label of tname. * character in the first label of tname.
*/ */
ch = tname.ndata[1]; ch = tname.ndata[1];
index = tableindex[ch]; i = tableindex[ch];
tlength = name_length(&tname); tlength = name_length(&tname);
toffset = (isc_uint16_t)(offset + (length - tlength)); toffset = (isc_uint16_t)(offset + (length - tlength));
if (toffset >= 0x4000) if (toffset >= 0x4000)
@@ -455,8 +455,8 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name,
node->name.ndata = node->r.base; node->name.ndata = node->r.base;
node->name.labels = tname.labels; node->name.labels = tname.labels;
node->name.attributes = DNS_NAMEATTR_ABSOLUTE; node->name.attributes = DNS_NAMEATTR_ABSOLUTE;
node->next = cctx->table[index]; node->next = cctx->table[i];
cctx->table[index] = node; cctx->table[i] = node;
start++; start++;
n--; n--;
count--; count--;