diff options
| author | Sami Kerola | 2015-01-01 00:01:21 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-01-07 10:08:21 +0100 |
| commit | 7ee26cbf025d915c6c15e2fe877ee92846f5992f (patch) | |
| tree | 532aa9b7a7f9807a0249830062ac26abd3d682b6 /libfdisk | |
| parent | fallocate: create mode 0666, that's what umask is for (diff) | |
| download | kernel-qcow2-util-linux-7ee26cbf025d915c6c15e2fe877ee92846f5992f.tar.gz kernel-qcow2-util-linux-7ee26cbf025d915c6c15e2fe877ee92846f5992f.tar.xz kernel-qcow2-util-linux-7ee26cbf025d915c6c15e2fe877ee92846f5992f.zip | |
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 <kerolasa@iki.fi>
Diffstat (limited to 'libfdisk')
| -rw-r--r-- | libfdisk/src/sun.c | 8 | ||||
| -rw-r--r-- | libfdisk/src/table.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c index babff6263..d99c39f6f 100644 --- a/libfdisk/src/sun.c +++ b/libfdisk/src/sun.c @@ -957,9 +957,11 @@ static int sun_write_disklabel(struct fdisk_context *cxt) sunlabel->nhead = cpu_to_be16(cxt->geom.heads); sunlabel->nsect = cpu_to_be16(cxt->geom.sectors); - if (cxt->geom.cylinders != be16_to_cpu(sunlabel->ncyl)) - sunlabel->ncyl = cpu_to_be16( cxt->geom.cylinders - - be16_to_cpu(sunlabel->acyl) ); + if (cxt->geom.cylinders != be16_to_cpu(sunlabel->ncyl)) { + int a = cpu_to_be16(cxt->geom.cylinders); + int b = be16_to_cpu(sunlabel->acyl); + sunlabel->ncyl = a - b; + } ush = (unsigned short *) sunlabel; 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; } |