[Midnightbsd-cvs] src [7695] trunk/usr.sbin/diskinfo/diskinfo.c: fixup error handling.

[laffer1 at midnightbsd.org]

Revision: 7695
          http://svnweb.midnightbsd.org/src/?rev=7695
Author:   laffer1
Date:     2016-08-11 18:12:34 -0400 (Thu, 11 Aug 2016)
Log Message:
-----------
fixup error handling. sync with freebsd 10 stable

Modified Paths:
--------------
    trunk/usr.sbin/diskinfo/diskinfo.c

Modified: trunk/usr.sbin/diskinfo/diskinfo.c
===================================================================
--- trunk/usr.sbin/diskinfo/diskinfo.c	2016-08-09 02:16:59 UTC (rev 7694)
+++ trunk/usr.sbin/diskinfo/diskinfo.c	2016-08-11 22:12:34 UTC (rev 7695)
@@ -99,13 +99,13 @@
 		}
 		error = ioctl(fd, DIOCGMEDIASIZE, &mediasize);
 		if (error) {
-			warn("%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
+			warnx("%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
 			exitval = 1;
 			goto out;
 		}
 		error = ioctl(fd, DIOCGSECTORSIZE, &sectorsize);
 		if (error) {
-			warn("%s: DIOCGSECTORSIZE failed, probably not a disk.", argv[i]);
+			warnx("%s: ioctl(DIOCGSECTORSIZE) failed, probably not a disk.", argv[i]);
 			exitval = 1;
 			goto out;
 		}
@@ -178,8 +178,10 @@
 
 	lseek(fd, (off_t)blockno * sectorsize, SEEK_SET);
 	error = read(fd, sector, sectorsize);
+	if (error == -1)
+		err(1, "read");
 	if (error != (int)sectorsize)
-		err(1, "read error or disk too small for test.");
+		errx(1, "disk too small for test.");
 }
 
 static void
@@ -188,8 +190,10 @@
 	int error;
 
 	error = read(fd, mega, sizeof(mega));
+	if (error == -1)
+		err(1, "read");
 	if (error != sizeof(mega))
-		err(1, "read error or disk too small for test.");
+		errx(1, "disk too small for test.");
 }
 
 static struct timeval tv1, tv2;