[src/trunk]: src/tests/lib/libc/sys PR/51867: Ngie Cooper: misc cleanups

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3f9869748bf
branches:  trunk
changeset: 350625:b3f9869748bf
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 14 20:52:42 2017 +0000

description:
PR/51867: Ngie Cooper: misc cleanups

diffstat:

 tests/lib/libc/sys/t_msync.c |  29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)

diffs (63 lines):

diff -r 28bc6831aef8 -r b3f9869748bf tests/lib/libc/sys/t_msync.c
--- a/tests/lib/libc/sys/t_msync.c      Sat Jan 14 20:51:13 2017 +0000
+++ b/tests/lib/libc/sys/t_msync.c      Sat Jan 14 20:52:42 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_msync.c,v 1.2 2012/03/16 06:15:17 matt Exp $ */
+/* $NetBSD: t_msync.c,v 1.3 2017/01/14 20:52:42 christos Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msync.c,v 1.2 2012/03/16 06:15:17 matt Exp $");
+__RCSID("$NetBSD: t_msync.c,v 1.3 2017/01/14 20:52:42 christos Exp $");
 
 #include <sys/mman.h>
 
@@ -52,8 +52,7 @@
 {
        char *buf, *map = MAP_FAILED;
        const char *str = NULL;
-       size_t i, len;
-       ssize_t tot;
+       size_t len;
        int fd, rv;
 
        /*
@@ -65,29 +64,17 @@
        if (buf == NULL)
                return NULL;
 
-       for (i = 0; i < (size_t)page; i++)
-               buf[i] = 'x';
+       memset(buf, 'x', page);
 
        fd = open(path, O_RDWR | O_CREAT, 0700);
 
        if (fd < 0) {
-               str = "failed to open";
-               goto out;
+               free(buf);
+               return "failed to open";
        }
 
-       tot = 0;
-
-       while (tot < page) {
-
-               rv = write(fd, buf, sizeof(buf));
-
-               if (rv < 0) {
-                       str = "failed to write";
-                       goto out;
-               }
-
-               tot += rv;
-       }
+       ATF_REQUIRE_MSG(write(fd, buf, page) != -1, "write(2) failed: %s",
+           strerror(errno));
 
        map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE|MAP_PRIVATE,
             fd, 0);