From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 5 Sep 2016 13:50:39 +0000 (+0000)
Subject: tests: use sprintrc in setrlimit.test
X-Git-Tag: v4.14~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a46700d6970e3bd1e0c016361a12356e7cb64c73;p=strace

tests: use sprintrc in setrlimit.test

* tests/setrlimit.c (main): Use sprintrc.
---

diff --git a/tests/setrlimit.c b/tests/setrlimit.c
index 04bb1370..95dd8985 100644
--- a/tests/setrlimit.c
+++ b/tests/setrlimit.c
@@ -43,8 +43,7 @@ main(void)
 	for (xlat = resources; xlat->str; ++xlat) {
 		unsigned long res = 0xfacefeed00000000 | xlat->val;
 		long rc = syscall(__NR_setrlimit, res, 0);
-		printf("setrlimit(%s, NULL) = %ld %s (%m)\n",
-		       xlat->str, rc, errno2name());
+		printf("setrlimit(%s, NULL) = %s\n", xlat->str, sprintrc(rc));
 
 		struct rlimit libc_rlim = {};
 		if (getrlimit((int) res, &libc_rlim))
@@ -53,16 +52,11 @@ main(void)
 		rlimit[1] = libc_rlim.rlim_max;
 
 		rc = syscall(__NR_setrlimit, res, rlimit);
-		int saved_errno = errno;
-		printf("setrlimit(%s, {rlim_cur=%s, rlim_max=%s})",
+		const char *errstr = sprintrc(rc);
+		printf("setrlimit(%s, {rlim_cur=%s, rlim_max=%s}) = %s\n",
 		       xlat->str,
-		       sprint_rlim(rlimit[0]), sprint_rlim(rlimit[1]));
-		if (rc) {
-			errno = saved_errno;
-			printf(" = %ld %s (%m)\n", rc, errno2name());
-		} else {
-			printf(" = 0\n");
-		}
+		       sprint_rlim(rlimit[0]), sprint_rlim(rlimit[1]),
+		       errstr);
 	}
 
 	puts("+++ exited with 0 +++");