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

4074. [cleanup] Cleaned up more warnings from gcc -Wshadow. [RT #38708]

Browse Source
This commit is contained in:
Mark Andrews
2015-02-27 10:55:55 +11:00
parent c10fda07d6
commit af669cb4fd
27 changed files with 210 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/isc/heap.c
View File

@@ -74,7 +74,7 @@ struct isc_heap {
isc_result_t
isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
isc_heapindex_t index, unsigned int size_increment,
isc_heapindex_t idx, unsigned int size_increment,
isc_heap_t **heapp)
{
isc_heap_t *heap;
@@ -96,7 +96,7 @@ isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
heap->last = 0;
heap->array = NULL;
heap->compare = compare;
heap->index = index;
heap->index = idx;
*heapp = heap;
@@ -203,14 +203,14 @@ isc_heap_insert(isc_heap_t *heap, void *elt) {
}
void
isc_heap_delete(isc_heap_t *heap, unsigned int index) {
isc_heap_delete(isc_heap_t *heap, unsigned int idx) {
void *elt;
isc_boolean_t less;
REQUIRE(VALID_HEAP(heap));
REQUIRE(index >= 1 && index <= heap->last);
REQUIRE(idx >= 1 && idx <= heap->last);
if (index == heap->last) {
if (idx == heap->last) {
heap->array[heap->last] = NULL;
heap->last--;
} else {
@@ -218,38 +218,38 @@ isc_heap_delete(isc_heap_t *heap, unsigned int index) {
heap->array[heap->last] = NULL;
heap->last--;
less = heap->compare(elt, heap->array[index]);
heap->array[index] = elt;
less = heap->compare(elt, heap->array[idx]);
heap->array[idx] = elt;
if (less)
float_up(heap, index, heap->array[index]);
float_up(heap, idx, heap->array[idx]);
else
sink_down(heap, index, heap->array[index]);
sink_down(heap, idx, heap->array[idx]);
}
}
void
isc_heap_increased(isc_heap_t *heap, unsigned int index) {
isc_heap_increased(isc_heap_t *heap, unsigned int idx) {
REQUIRE(VALID_HEAP(heap));
REQUIRE(index >= 1 && index <= heap->last);
REQUIRE(idx >= 1 && idx <= heap->last);
float_up(heap, index, heap->array[index]);
float_up(heap, idx, heap->array[idx]);
}
void
isc_heap_decreased(isc_heap_t *heap, unsigned int index) {
isc_heap_decreased(isc_heap_t *heap, unsigned int idx) {
REQUIRE(VALID_HEAP(heap));
REQUIRE(index >= 1 && index <= heap->last);
REQUIRE(idx >= 1 && idx <= heap->last);
sink_down(heap, index, heap->array[index]);
sink_down(heap, idx, heap->array[idx]);
}
void *
isc_heap_element(isc_heap_t *heap, unsigned int index) {
isc_heap_element(isc_heap_t *heap, unsigned int idx) {
REQUIRE(VALID_HEAP(heap));
REQUIRE(index >= 1);
REQUIRE(idx >= 1);
if (index <= heap->last)
return (heap->array[index]);
if (idx <= heap->last)
return (heap->array[idx]);
return (NULL);
}