wipefs: fix variable / function shadowing [cppcheck]
[misc-utils/wipefs.c:636] -> [misc-utils/wipefs.c:310]: (style) Local variable usage shadows outer function Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
parent
ff09a5129a
commit
9abc8a42aa
|
@ -307,7 +307,7 @@ static struct wipe_desc *get_desc_for_probe(struct wipe_control *ctl,
|
||||||
loff_t *offset,
|
loff_t *offset,
|
||||||
size_t *len)
|
size_t *len)
|
||||||
{
|
{
|
||||||
const char *off, *type, *mag, *p, *usage = NULL;
|
const char *off, *type, *mag, *p, *use = NULL;
|
||||||
struct wipe_desc *wp;
|
struct wipe_desc *wp;
|
||||||
int rc, ispt = 0;
|
int rc, ispt = 0;
|
||||||
|
|
||||||
|
@ -328,7 +328,7 @@ static struct wipe_desc *get_desc_for_probe(struct wipe_control *ctl,
|
||||||
rc = blkid_probe_lookup_value(pr, "PTMAGIC", &mag, len);
|
rc = blkid_probe_lookup_value(pr, "PTMAGIC", &mag, len);
|
||||||
if (rc)
|
if (rc)
|
||||||
return NULL;
|
return NULL;
|
||||||
usage = N_("partition-table");
|
use = N_("partition-table");
|
||||||
ispt = 1;
|
ispt = 1;
|
||||||
} else
|
} else
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -357,8 +357,8 @@ static struct wipe_desc *get_desc_for_probe(struct wipe_control *ctl,
|
||||||
if (!wp)
|
if (!wp)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (usage || blkid_probe_lookup_value(pr, "USAGE", &usage, NULL) == 0)
|
if (use || blkid_probe_lookup_value(pr, "USAGE", &use, NULL) == 0)
|
||||||
wp->usage = xstrdup(usage);
|
wp->usage = xstrdup(use);
|
||||||
|
|
||||||
wp->type = xstrdup(type);
|
wp->type = xstrdup(type);
|
||||||
wp->on_disk = 1;
|
wp->on_disk = 1;
|
||||||
|
|
Loading…
Reference in New Issue