On Tue, Jul 01, 2014 at 09:40:04PM +0100, Sami Kerola wrote:
> disk-utils/Makemodule.am | 6 +++---
> disk-utils/swaplabel.c | 46 ----------------------------------------------
> sys-utils/Makemodule.am | 14 ++++++++++----
> sys-utils/swapon-common.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
> sys-utils/swapon-common.h | 2 ++
> sys-utils/swapon.c | 38 ++++++++++++++++++++++++++++++++++++--
> 6 files changed, 95 insertions(+), 55 deletions(-)
Applied, thanks.
> + case COL_UUID:
> + if (pr && !blkid_probe_lookup_value(pr, "UUID", &data, NULL))
> + xasprintf(&str, "%s", data);
> + else if (pr)
> + xasprintf(&str, "");
This is unnecessary, it's fine to keep cells in smartcols table empty
(NULL).
> + else
> + xasprintf(&str, _("read failed"));
I have removed this, it's bad idea to use data fields to report error
messages (or so). It's too complicated semantic for scripts. On
another places we usually silently keep the fields empty when we have
no rights to read UUID/LABEL,...
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
