diff options
| author | Karel Zak | 2019-05-20 12:35:38 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-05-20 12:35:38 +0200 |
| commit | 002931c485dd66c23b63750a7d9d09637e9bc1ef (patch) | |
| tree | f4209fc28f52b9aa6159af0afb43b43f07b4326f /misc-utils | |
| parent | Merge branch 'lscpu_midr_updates' of https://github.com/jlinton/util-linux (diff) | |
| parent | lib/colors: remove redundant if statement (diff) | |
| download | kernel-qcow2-util-linux-002931c485dd66c23b63750a7d9d09637e9bc1ef.tar.gz kernel-qcow2-util-linux-002931c485dd66c23b63750a7d9d09637e9bc1ef.tar.xz kernel-qcow2-util-linux-002931c485dd66c23b63750a7d9d09637e9bc1ef.zip | |
Merge branch '2019wk19' of https://github.com/kerolasa/util-linux
* '2019wk19' of https://github.com/kerolasa/util-linux:
lib/colors: remove redundant if statement
wipefs: fix variable / function shadowing [cppcheck]
sulogin: fix variable / function shadowing [cppcheck]
lscpu: remove redundant condition check [cppcheck]
libmount: avoid possible null pointer dereference [cppcheck]
lib/mangle: fix possible null pointer dereference [cppcheck]
sfdisk: remove unnecessary size check [cppcheck]
Diffstat (limited to 'misc-utils')
| -rw-r--r-- | misc-utils/wipefs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index 78e5ac376..be728279b 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -307,7 +307,7 @@ static struct wipe_desc *get_desc_for_probe(struct wipe_control *ctl, loff_t *offset, size_t *len) { - const char *off, *type, *mag, *p, *usage = NULL; + const char *off, *type, *mag, *p, *use = NULL; struct wipe_desc *wp; 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); if (rc) return NULL; - usage = N_("partition-table"); + use = N_("partition-table"); ispt = 1; } else return NULL; @@ -357,8 +357,8 @@ static struct wipe_desc *get_desc_for_probe(struct wipe_control *ctl, if (!wp) return NULL; - if (usage || blkid_probe_lookup_value(pr, "USAGE", &usage, NULL) == 0) - wp->usage = xstrdup(usage); + if (use || blkid_probe_lookup_value(pr, "USAGE", &use, NULL) == 0) + wp->usage = xstrdup(use); wp->type = xstrdup(type); wp->on_disk = 1; |