summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2009-01-06 14:40:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 15:59:11 -0800
commit40bc1f2dbc29ab88176a650e51f2246526105093 (patch)
tree0c9fd0f1a3430118214b06acfdb61bb80bb4fa7d
parent60348802e9cb137ee86590c3e4c57c1ec2e8fc69 (diff)
downloadlinux-40bc1f2dbc29ab88176a650e51f2246526105093.tar.gz
linux-40bc1f2dbc29ab88176a650e51f2246526105093.tar.bz2
linux-40bc1f2dbc29ab88176a650e51f2246526105093.zip
lib: fix sparse shadowed variable warning
pos is always set before being used, no need to declare a second one inside the if() block. lib/prio_heap.c:34:7: warning: symbol 'pos' shadows an earlier one lib/prio_heap.c:30:6: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--lib/prio_heap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/prio_heap.c b/lib/prio_heap.c
index 471944a54e23..a7af6f85eca8 100644
--- a/lib/prio_heap.c
+++ b/lib/prio_heap.c
@@ -31,7 +31,7 @@ void *heap_insert(struct ptr_heap *heap, void *p)
if (heap->size < heap->max) {
/* Heap insertion */
- int pos = heap->size++;
+ pos = heap->size++;
while (pos > 0 && heap->gt(p, ptrs[(pos-1)/2])) {
ptrs[pos] = ptrs[(pos-1)/2];
pos = (pos-1)/2;