From: Karel Zak Date: Tue, 22 Jul 2014 10:24:56 +0000 (+0200) Subject: swapon: don't use empty strings for smartcols output X-Git-Tag: v2.26-rc1~598 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c1fa4691fc40540450638bc9c15d9bd8f8d07cc;p=thirdparty%2Futil-linux.git swapon: don't use empty strings for smartcols output The libsmartcols is smart enough to accept NULL for empty fields rather than empty strings. Signed-off-by: Karel Zak --- diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 0c8ca03e14..02cad024a5 100644 --- a/sys-utils/swapon.c +++ b/sys-utils/swapon.c @@ -199,17 +199,13 @@ static void add_scols_line(struct libscols_table *table, struct libmnt_fs *fs, i case COL_UUID: if (pr && !blkid_probe_lookup_value(pr, "UUID", &data, NULL)) xasprintf(&str, "%s", data); - else if (pr) - xasprintf(&str, ""); - else + else if (!pr) xasprintf(&str, _("read failed")); break; case COL_LABEL: if (pr && !blkid_probe_lookup_value(pr, "LABEL", &data, NULL)) xasprintf(&str, "%s", data); - else if (pr) - xasprintf(&str, ""); - else + else if (!pr) xasprintf(&str, _("read failed")); break; default: