From 7c1fa4691fc40540450638bc9c15d9bd8f8d07cc Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 22 Jul 2014 12:24:56 +0200 Subject: 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 --- sys-utils/swapon.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sys-utils/swapon.c') diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 0c8ca03e1..02cad024a 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: -- cgit v1.2.3-55-g7522