misc-utils/blkid.c:402:15: warning: declaration of 'usage' shadows a global declaration [-Wshadow]
misc-utils/blkid.c:63:13: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
misc-utils/blkid.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 579ad27..920f639 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -399,17 +399,17 @@ static int print_udev_ambivalent(blkid_probe pr)
int count = 0, rc = -1;
while (!blkid_do_probe(pr)) {
- const char *usage = NULL, *type = NULL, *version = NULL;
+ const char *usage_txt = NULL, *type = NULL, *version = NULL;
char enc[256];
- blkid_probe_lookup_value(pr, "USAGE", &usage, NULL);
+ blkid_probe_lookup_value(pr, "USAGE", &usage_txt, NULL);
blkid_probe_lookup_value(pr, "TYPE", &type, NULL);
blkid_probe_lookup_value(pr, "VERSION", &version, NULL);
- if (!usage || !type)
+ if (!usage_txt || !type)
continue;
- blkid_encode_string(usage, enc, sizeof(enc));
+ blkid_encode_string(usage_txt, enc, sizeof(enc));
if (append_str(&val, &valsz, enc, ":"))
goto done;
--
1.7.11.3
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
