]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
blkid: fix shadow declaration
authorSami Kerola <kerolasa@iki.fi>
Wed, 25 Jul 2012 19:15:25 +0000 (21:15 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 26 Jul 2012 09:10:02 +0000 (11:10 +0200)
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@iki.fi>
misc-utils/blkid.c

index e47a79381a5044bf537a5ec723b5e45306795193..fa38d82f6b607728196c4ac2fb4ab8af75add5bb 100644 (file)
@@ -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;