[Libguestfs] [nbdkit PATCH 08/10] cache: Avoid -Wshadow warnings
The cache filter declares 'blksize' as a global; the common bitmap.h
header shadows this. It's easy enough to rename to avoid the warning.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
common/bitmap/bitmap.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/bitmap/bitmap.h b/common/bitmap/bitmap.h
index d80cdfe6..c18ae93a 100644
--- a/common/bitmap/bitmap.h
+++ b/common/bitmap/bitmap.h
@@ -65,10 +65,10 @@ struct bitmap {
};
static inline void __attribute__((__nonnull__ (1)))
-bitmap_init (struct bitmap *bm, unsigned blksize, unsigned bpb)
+bitmap_init (struct bitmap *bm, unsigned blocksize, unsigned bpb)
{
- assert (is_power_of_2 (blksize));
- bm->blksize = blksize;
+ assert (is_power_of_2 (blocksize));
+ bm->blksize = blocksize;
/* bpb can be 1, 2, 4 or 8 only. */
bm->bpb = bpb;
--
2.21.0