]> granicus.if.org Git - strace/commitdiff
tests/preadv-pwritev.c: cleanup
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 21 Apr 2016 21:14:52 +0000 (21:14 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 21 Apr 2016 22:05:56 +0000 (22:05 +0000)
tests/preadv-pwritev.c

index 9f4fb4c2870a5c76bbef6df942cb0786e7261886..3e9a669a0734beecbc3ad9bdd19df8c2f32696e5 100644 (file)
@@ -67,16 +67,12 @@ main(void)
        long rc;
 
        rc = pwritev(1, efault, 42, 0);
-       if (rc != -1)
-               perror_msg_and_fail("pwritev: expected -1, returned %ld", rc);
-       tprintf("pwritev(1, %p, 42, 0) = -1 %s (%m)\n",
-               efault, errno2name());
+       tprintf("pwritev(1, %p, 42, 0) = %ld %s (%m)\n",
+               efault, rc, errno2name());
 
        rc = preadv(0, efault, 42, 0);
-       if (rc != -1)
-               perror_msg_and_fail("preadv: expected -1, returned %ld", rc);
-       tprintf("preadv(0, %p, 42, 0) = -1 %s (%m)\n",
-               efault, errno2name());
+       tprintf("preadv(0, %p, 42, 0) = %ld %s (%m)\n",
+               efault, rc, errno2name());
 
        static const char r0_c[] = "01234567";
        const char *r0_d = hexdump_strdup(r0_c);
@@ -103,12 +99,9 @@ main(void)
        tprintf("pwritev(1, [], 0, 0) = 0\n");
 
        rc = pwritev(1, w_iov + ARRAY_SIZE(w_iov_) - 1, 2, 0);
-       if (rc != -1)
-               perror_msg_and_fail("pwritev: expected -1 EFAULT, returned %ld",
-                                   rc);
-       tprintf("pwritev(1, [{\"%s\", %u}, %p], 2, 0) = -1 %s (%m)\n",
+       tprintf("pwritev(1, [{\"%s\", %u}, %p], 2, 0) = %ld %s (%m)\n",
                w2_c, LENGTH_OF(w2_c), w_iov + ARRAY_SIZE(w_iov_),
-               errno2name());
+               rc, errno2name());
 
        const unsigned int w_len =
                LENGTH_OF(w0_c) + LENGTH_OF(w1_c) + LENGTH_OF(w2_c);