[src/trunk]: src/regress/sys/fs/lseek use err instead of printf, fix missing ...

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

details:   https://anonhg.NetBSD.org/src/rev/e34e66764e58
branches:  trunk
changeset: 765031:e34e66764e58
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 16 12:43:59 2011 +0000

description:
use err instead of printf, fix missing prototypes.

diffstat:

 regress/sys/fs/lseek/lseek.c |  124 +++++++++++++++---------------------------
 1 files changed, 46 insertions(+), 78 deletions(-)

diffs (193 lines):

diff -r a0f74d4a5cc1 -r e34e66764e58 regress/sys/fs/lseek/lseek.c
--- a/regress/sys/fs/lseek/lseek.c      Mon May 16 10:53:19 2011 +0000
+++ b/regress/sys/fs/lseek/lseek.c      Mon May 16 12:43:59 2011 +0000
@@ -2,6 +2,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <err.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
 #include <sys/inttypes.h>
@@ -13,136 +14,103 @@
        struct stat st;
        int error;
 
-       if (argc != 2) {
-               printf("seektest filename\n");
-               return EXIT_FAILURE;
-       }
+       if (argc != 2)
+               errx(EXIT_FAILURE, "seektest filename");
        fd = open(argv[1], 0, O_RDONLY);
-       if (fd <= 0) {
-               printf("can't open `%s` : %s\n", argv[1], strerror(errno));
-               return EXIT_FAILURE;
-       }
+       if (fd <= 0)
+               err(EXIT_FAILURE, "can't open `%s'", argv[1]);
 
        printf("Statting file\n");
        error = fstat(fd, &st);
-       if (error) {
-               printf("can't stat file\n");
-               return EXIT_FAILURE;
-       }
+       if (error)
+               err(EXIT_FAILURE, "can't stat file");
        printf("fstat() returns %"PRIi64" as size\n", st.st_size);
 
        error = stat(argv[1], &st);
-       if (error) {
-               printf("can't stat file\n");
-               return EXIT_FAILURE;
-       }
+       if (error)
+               err(EXIT_FAILURE, "can't stat file");
        printf("stat()  returns %"PRIi64" as size\n", st.st_size);
 
        error = lstat(argv[1], &st);
-       if (error) {
-               printf("can't lstat file\n");
-               return EXIT_FAILURE;
-       }
+       if (error)
+               err(EXIT_FAILURE, "can't lstat file");
        printf("lstat() returns %"PRIi64" as size\n", st.st_size);
 
        printf("\nTesting normal seeking\n");
        printf("get initial position\n");
        cur = lseek(fd, 0, SEEK_CUR);
+       if (cur != 0)
+               err(EXIT_FAILURE, "seek initial position wrong");
        printf("seek start %"PRIi64"\n", cur);
-       if (cur != 0) {
-               printf("seek initial position wrong\n");
-               return EXIT_FAILURE;
-       }
 
        printf("seeking end (filesize = %"PRIi64")\n", st.st_size);
        cur = lseek(fd, 0, SEEK_END);
+       if (cur != st.st_size)
+               err(EXIT_FAILURE, "seek to the end went wrong");
        printf("seek now %"PRIi64"\n", cur);
-       if (cur != st.st_size) {
-               printf("seek to the end went wrong\n");
-               return EXIT_FAILURE;
-       }
 
-       printf("seeking backwards filesize-150 steps\n");
+       printf("seeking backwards filesize - 150 steps\n");
        cur = lseek(fd, -(st.st_size - 150), SEEK_CUR);
+       if (cur != 150)
+               err(EXIT_FAILURE, "relative seek from end to 150 failed");
        printf("seek now %"PRIi64"\n", cur);
-       if (cur != 150) {
-               printf("relative seek from end to 150 failed\n");
-               return EXIT_FAILURE;
-       }
 
        printf("seek set 1000\n");
        cur = lseek(fd, 1000, SEEK_SET);
+       if (cur != 1000)
+               err(EXIT_FAILURE, "seek 1000 went wrong");
        printf("seek now %"PRIi64"\n", cur);
-       if (cur != 1000) {
-               printf("seek 1000 went wrong\n");
-               return EXIT_FAILURE;
-       }
 
 #if defined SEEK_DATA
        printf("\nOne piece non sparse file checking:\n");
        printf("seeking for sparse file data offset\n");
        cur = lseek(fd, 0, SEEK_DATA);
-       if (cur != 0) {
-               printf("Not getting start of data segment at 0\n");
-               return EXIT_FAILURE;
-       }
+       if (cur != 0)
+               err(EXIT_FAILURE, "Not getting start of data segment at 0");
 
        printf("if seek_data returns a 2nd part on a non-sparse file\n");
        cur = lseek(fd, st.st_size, SEEK_DATA);
-       if (cur != -1) {
-               printf("Seek data gave 2nd part at end of file\n");
-               return EXIT_FAILURE;
-       }
-       if (errno != ENXIO) {
-               printf( "Seek data on the end of file didn't"
-                       " raise ENXIO\n");
-               return EXIT_FAILURE;
-       }
-
+       if (cur != -1)
+               errx(EXIT_FAILURE, "Seek data gave 2nd part at end of file");
+       if (errno != ENXIO)
+               errx(EXIT_FAILURE, "Seek data on the end of file didn't"
+                       " raise ENXIO (%d)", errno);
        printf( "if seek_data in the file's last block of a non-sparse file "
                "returns the current position\n");
        cur = lseek(fd, st.st_size-50, SEEK_DATA);
        if (cur != st.st_size - 50) {
-               printf("Seek data didn't give passed seek position back\n");
-               printf("%"PRIi64" should be %"PRIi64"\n", cur, st.st_size-50);
+               errx(EXIT_FAILURE"Seek data didn't give passed seek position "
+                   "back %" PRIi64 " should be %" PRIi64, cur, st.st_size-50);
                return EXIT_FAILURE;
        }
 
-       printf( "if seek_data in the middle of the of a non-sparse file "
+       printf("if seek_data in the middle of the of a non-sparse file "
                "returns the current position\n");
-       cur = lseek(fd, st.st_size-100*1024, SEEK_DATA);
-       if (cur != st.st_size - 100*1024) {
-               printf("Seek data didn't give passed seek position back\n");
-               printf("%"PRIi64" should be %"PRIi64"\n", cur,
-                       st.st_size-100*1024);
-               return EXIT_FAILURE;
-       }
+       cur = lseek(fd, st.st_size - 100 * 1024, SEEK_DATA);
+       if (cur != st.st_size - 100 * 1024)
+               errx(EXIT_FAILURE, "Seek data didn't give passed seek "
+                   "position back %" PRIi64 " should be %" PRIi64, cur,
+                   st.st_size - 100 * 1024);
 
        printf("seeking for hole\n");
        cur = lseek(fd, 0, SEEK_HOLE);
-       if (cur != st.st_size) {
-               printf("Seek hole didn't return end of file\n");
-               return EXIT_FAILURE;
-       }
+       if (cur != st.st_size)
+               errx(EXIT_FAILURE, "Seek hole didn't return end of file");
 
        printf("seeking if the end of the file is a hole\n");
        cur = lseek(fd, st.st_size, SEEK_HOLE);
-       if (cur != st.st_size) {
-               printf("At the end of the file, no virtual hole is returned\n");
-               return EXIT_FAILURE;
-       }
+       if (cur != st.st_size)
+               errx(EXIT_FAILURE, "At the end of the file, no virtual hole "
+                   "is returned");
 
        printf("seeking if a 2nd hole is returned outside the file range\n");
        cur = lseek(fd, st.st_size + 1, SEEK_HOLE);
-       if (cur != -1) {
-               printf( "Past the end of file, seek hole returned another hole "
-                       "instead of raising an error\n");
-               return EXIT_FAILURE;
-       }
-       if (errno != ENXIO) {
-               printf("Seek hole past the end of file didn't raise ENXIO\n");
-               return EXIT_FAILURE;
-       }
+       if (cur != -1)
+               errx(EXIT_FAILURE, "Past the end of file, seek hole returned "
+                   "another hole instead of raising an error");
+       if (errno != ENXIO)
+               errx(EXIT_FAILURE, "Seek hole past the end of file didn't "
+                   "raise ENXIO (%d)", errno);
 #endif
 
        return EXIT_SUCCESS;