svn commit: r281393 - head/tools/regression/sockets/sblock

[Garrett Cooper]

Author: ngie
Date: Sat Apr 11 03:13:09 2015
New Revision: 281393
URL: https://svnweb.freebsd.org/changeset/base/281393

Log:
  Fix warnings and bump WARNS to 6
  - Garbage collect argc/argv (-Wunused)
  - sleep(3) will always return an unsigned int; don't check for return codes <0
    (-Wsign-compare)
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/regression/sockets/sblock/Makefile
  head/tools/regression/sockets/sblock/sblock.c

Modified: head/tools/regression/sockets/sblock/Makefile
==============================================================================
--- head/tools/regression/sockets/sblock/Makefile	Sat Apr 11 02:59:45 2015	(r281392)
+++ head/tools/regression/sockets/sblock/Makefile	Sat Apr 11 03:13:09 2015	(r281393)
@@ -4,6 +4,6 @@
 
 PROG=	sblock
 MAN=
-WARNS?=	2
+WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: head/tools/regression/sockets/sblock/sblock.c
==============================================================================
--- head/tools/regression/sockets/sblock/sblock.c	Sat Apr 11 02:59:45 2015	(r281392)
+++ head/tools/regression/sockets/sblock/sblock.c	Sat Apr 11 03:13:09 2015	(r281393)
@@ -54,7 +54,7 @@
 
 static int interrupted;
 static void
-signal_handler(int signum)
+signal_handler(int signum __unused)
 {
 
 	interrupted++;
@@ -95,7 +95,7 @@ locking_recver(int fd)
 	ssize_t len;
 	char ch;
 
-	if (sleep(1) < 0)
+	if (sleep(1) != 0)
 		err(-1, "FAIL: locking_recver: sleep");
 	len = recv(fd, &ch, sizeof(ch), 0);
 	if (len < 0 && errno != EINTR)
@@ -116,7 +116,7 @@ signaller(pid_t locking_recver_pid, int 
 	ssize_t len;
 	char ch;
 
-	if (sleep(2) < 0) {
+	if (sleep(2) != 0) {
 		warn("signaller sleep(2)");
 		return;
 	}
@@ -124,7 +124,7 @@ signaller(pid_t locking_recver_pid, int 
 		warn("signaller kill(%d)", locking_recver_pid);
 		return;
 	}
-	if (sleep(1) < 0) {
+	if (sleep(1) != 0) {
 		warn("signaller sleep(1)");
 		return;
 	}
@@ -141,14 +141,14 @@ signaller(pid_t locking_recver_pid, int 
 		warn("signaller close");
 		return;
 	}
-	if (sleep(1) < 0) {
+	if (sleep(1) != 0) {
 		warn("signaller sleep(1)");
 		return;
 	}
 }
 
 int
-main(int argc, char *argv[])
+main(void)
 {
 	int error, fds[2], recver_fd, sender_fd;
 	pid_t blocking_recver_pid;