summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/mkswap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index a6077daf0..cbb99dccb 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -259,6 +259,8 @@ static void wipe_device(struct mkswap_control *ctl)
blkid_probe pr = NULL;
#endif
if (!ctl->force) {
+ const char *v = NULL;
+
if (lseek(ctl->fd, 0, SEEK_SET) != 0)
errx(EXIT_FAILURE, _("unable to rewind swap-device"));
@@ -268,9 +270,8 @@ static void wipe_device(struct mkswap_control *ctl)
blkid_probe_enable_superblocks(pr, 0);
if (blkid_do_fullprobe(pr) == 0 &&
- blkid_probe_lookup_value(pr, "PTTYPE",
- (const char **) &type, NULL) == 0 && type) {
- type = xstrdup(type);
+ blkid_probe_lookup_value(pr, "PTTYPE", &v, NULL) == 0 && v) {
+ type = xstrdup(v);
zap = 0;
}
#else