From: Karel Zak <kzak@redhat.com>
Date: Mon, 10 Jun 2013 09:55:52 +0000 (+0200)
Subject: prlimit: use TT_FL_FREEDATA for tt table
X-Git-Tag: v2.24-rc1~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e7708511fbae88d19d00ee7e4eba7e7987ff86a;p=thirdparty%2Futil-linux.git

prlimit: use TT_FL_FREEDATA for tt table

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 6d9ded223d..5bb99d1ec5 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -226,20 +226,20 @@ static void add_tt_line(struct tt *tt, struct prlimit *l)
 
 		switch (get_column_id(i)) {
 		case COL_RES:
-			xasprintf(&str, "%s", l->desc->name);
+			str = xstrdup(l->desc->name);
 			break;
 		case COL_HELP:
-			xasprintf(&str, "%s", l->desc->help);
+			str = xstrdup(l->desc->help);
 			break;
 		case COL_SOFT:
 			if (l->rlim.rlim_cur == RLIM_INFINITY)
-				xasprintf(&str, "%s", "unlimited");
+				str = xstrdup(_("unlimited"));
 			else
 				xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_cur);
 			break;
 		case COL_HARD:
 			if (l->rlim.rlim_max == RLIM_INFINITY)
-				xasprintf(&str, "%s", "unlimited");
+				str = xstrdup(_("unlimited"));
 			else
 				xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_max);
 			break;
@@ -285,7 +285,7 @@ static int show_limits(struct list_head *lims, int tt_flags)
 	struct list_head *p, *pnext;
 	struct tt *tt;
 
-	tt = tt_new_table(tt_flags);
+	tt = tt_new_table(tt_flags | TT_FL_FREEDATA);
 	if (!tt) {
 		warn(_("failed to initialize output table"));
 		return -1;