From: Karel Zak <kzak@redhat.com>
Date: Wed, 12 Dec 2012 11:16:16 +0000 (+0100)
Subject: prlimit: don't care about xasprintf() return code
X-Git-Tag: v2.23-rc1~432
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a9fcc91357c461735e3ff0159b55931d453d05;p=thirdparty%2Futil-linux.git

prlimit: don't care about xasprintf() return code

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

diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 2055adf753..a619bea3ee 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -225,23 +225,24 @@ static void add_tt_line(struct tt *tt, struct prlimit *l)
 
 	for (i = 0; i < ncolumns; i++) {
 		char *str = NULL;
-		int rc = 0;
 
 		switch (get_column_id(i)) {
 		case COL_RES:
-			rc = xasprintf(&str, "%s", l->desc->name);
+			xasprintf(&str, "%s", l->desc->name);
 			break;
 		case COL_HELP:
-			rc = xasprintf(&str, "%s", l->desc->help);
+			xasprintf(&str, "%s", l->desc->help);
 			break;
 		case COL_SOFT:
-			rc = l->rlim.rlim_cur == RLIM_INFINITY ?
-				xasprintf(&str, "%s", "unlimited") :
+			if (l->rlim.rlim_cur == RLIM_INFINITY)
+				xasprintf(&str, "%s", "unlimited");
+			else
 				xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_cur);
 			break;
 		case COL_HARD:
-			rc = l->rlim.rlim_max == RLIM_INFINITY ?
-				xasprintf(&str, "%s", "unlimited") :
+			if (l->rlim.rlim_max == RLIM_INFINITY)
+				xasprintf(&str, "%s", "unlimited");
+			else
 				xasprintf(&str, "%llu", (unsigned long long) l->rlim.rlim_max);
 			break;
 		case COL_UNITS:
@@ -251,7 +252,7 @@ static void add_tt_line(struct tt *tt, struct prlimit *l)
 			break;
 		}
 
-		if (rc || str)
+		if (str)
 			tt_line_set_data(line, i, str);
 	}
 }