From dbcafb870f9622841d57a7554d8c4af258abc203 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 3 Feb 2011 12:01:45 +0100 Subject: [PATCH] blkid: don't print devname if nothing detected Signed-off-by: Karel Zak --- misc-utils/blkid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 2f7860fd23..11eee2e7fb 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -513,13 +513,14 @@ static int lowprobe_device(blkid_probe pr, const char *devname, if (rc < 0) goto done; - nvals = blkid_probe_numof_values(pr); + if (!rc) + nvals = blkid_probe_numof_values(pr); if (nvals && !first && output & (OUTPUT_UDEV_LIST | OUTPUT_EXPORT_LIST)) /* add extra line between output from devices */ fputc('\n', stdout); - if (output & OUTPUT_DEVICE_ONLY) { + if (nvals && (output & OUTPUT_DEVICE_ONLY)) { printf("%s\n", devname); goto done; } -- 2.47.3