From 7ee26cbf025d915c6c15e2fe877ee92846f5992f Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Wed, 31 Dec 2014 23:01:21 +0000 Subject: maint: fix shadow declaration This change fixes all shadow declarations. The worth while to mention fix is with libfdisk sun geometry. It comes from bitops.h cpu_to_be16 macro that further expands from include/bits/byteswap.h that has the shadowing. libfdisk/src/sun.c:961:173: warning: declaration of '__v' shadows a previous local [-Wshadow] libfdisk/src/sun.c:961:69: warning: shadowed declaration is here [-Wshadow] libfdisk/src/sun.c:961:178: warning: declaration of '__x' shadows a previous local [-Wshadow] libfdisk/src/sun.c:961:74: warning: shadowed declaration is here [-Wshadow] That could have caused earlier some unexpected results. Signed-off-by: Sami Kerola --- libfdisk/src/table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libfdisk/src/table.c') diff --git a/libfdisk/src/table.c b/libfdisk/src/table.c index 1add09fca..923481452 100644 --- a/libfdisk/src/table.c +++ b/libfdisk/src/table.c @@ -437,16 +437,16 @@ static int table_add_freespace( } while (fdisk_table_next_partition(tb, &itr, &x) == 0) { - fdisk_sector_t end, best_end = 0; + fdisk_sector_t the_end, best_end = 0; if (!fdisk_partition_has_end(x)) continue; - end = fdisk_partition_get_end(x); + the_end = fdisk_partition_get_end(x); if (best) best_end = fdisk_partition_get_end(best); - if (end < pa->start && (!best || best_end < end)) + if (the_end < pa->start && (!best || best_end < the_end)) best = x; } -- cgit v1.2.3-55-g7522