prlimit: make code more robust
The prlimit description are always defined as static strings, but it seems better to make the code more readable and robust for static analyzers and readers. Fix also missing gettext() call for description help. Fixes: https://github.com/karelzak/util-linux/issues/1277 Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
e741653d22
commit
91f6895fff
|
@ -233,10 +233,12 @@ static void add_scols_line(struct libscols_table *table, struct prlimit *l)
|
|||
|
||||
switch (get_column_id(i)) {
|
||||
case COL_RES:
|
||||
str = xstrdup(l->desc->name);
|
||||
if (l->desc->name)
|
||||
str = xstrdup(l->desc->name);
|
||||
break;
|
||||
case COL_HELP:
|
||||
str = xstrdup(l->desc->help);
|
||||
if (l->desc->help)
|
||||
str = xstrdup(_(l->desc->help));
|
||||
break;
|
||||
case COL_SOFT:
|
||||
if (l->rlim.rlim_cur == RLIM_INFINITY)
|
||||
|
@ -251,7 +253,8 @@ static void add_scols_line(struct libscols_table *table, struct prlimit *l)
|
|||
xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_max);
|
||||
break;
|
||||
case COL_UNITS:
|
||||
str = l->desc->unit ? xstrdup(_(l->desc->unit)) : NULL;
|
||||
if (l->desc->unit)
|
||||
str = xstrdup(_(l->desc->unit));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue