]> granicus.if.org Git - strace/commitdiff
tests: use sprintrc in setrlimit.test
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 5 Sep 2016 13:50:39 +0000 (13:50 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 5 Sep 2016 15:58:35 +0000 (15:58 +0000)
* tests/setrlimit.c (main): Use sprintrc.

tests/setrlimit.c

index 04bb1370e393fad848d2356349275decfa8ccba0..95dd898587c89d8897513aa13f46fa6451f025d1 100644 (file)
@@ -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 +++");