From: Jan Safranek <jsafrane@redhat.com>
Date: Thu, 6 Aug 2009 12:03:19 +0000 (+0200)
Subject: Shorten error text of ECGOTHER
X-Git-Tag: v0.35~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76b46b3e37dc3417e63654e262067e995c509bb4;p=thirdparty%2Flibcgroup.git

Shorten error text of ECGOTHER

Let's reformat cgroup_strerror output from

	Cgroup generic error, error message: Device or resource busy

to shorter and clearer

	Device or resource busy

The patch assumes that _GNU_SOURCE is defined.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
---

diff --git a/src/api.c b/src/api.c
index 48476788..fef0e761 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2505,10 +2505,7 @@ char *cgroup_strerror(int code)
 {
 	assert((code >= ECGROUPNOTCOMPILED) && (code < ECGSENTINEL));
 	if (code == ECGOTHER) {
-		snprintf(errtext, MAXLEN, "%s, error message: %s",
-			cgroup_strerror_codes[code % ECGROUPNOTCOMPILED],
-			strerror(cgroup_get_last_errno()));
-		return errtext;
+		return strerror_r(cgroup_get_last_errno(), errtext, MAXLEN);
 	}
 	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
 }