diff options
| author | Karel Zak | 2011-02-03 12:01:45 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-02-03 12:01:45 +0100 |
| commit | dbcafb870f9622841d57a7554d8c4af258abc203 (patch) | |
| tree | 664ea44f81f83c716029cb7e9fda1a4abf9b6001 /misc-utils/blkid.c | |
| parent | libmount: cleanup helper initialization API (diff) | |
| download | kernel-qcow2-util-linux-dbcafb870f9622841d57a7554d8c4af258abc203.tar.gz kernel-qcow2-util-linux-dbcafb870f9622841d57a7554d8c4af258abc203.tar.xz kernel-qcow2-util-linux-dbcafb870f9622841d57a7554d8c4af258abc203.zip | |
blkid: don't print devname if nothing detected
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/blkid.c')
| -rw-r--r-- | misc-utils/blkid.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 2f7860fd2..11eee2e7f 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; } |