svn commit: r281586 - user/ngie/more-tests/tests/sys/socket

[Garrett Cooper]

Author: ngie
Date: Thu Apr 16 05:37:19 2015
New Revision: 281586
URL: https://svnweb.freebsd.org/changeset/base/281586

Log:
  Fix WARNS=6 issues with gcc

Modified:
  user/ngie/more-tests/tests/sys/socket/reconnect_test.c
  user/ngie/more-tests/tests/sys/socket/sigpipe_test.c
  user/ngie/more-tests/tests/sys/socket/unix_gc_test.c
  user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c
  user/ngie/more-tests/tests/sys/socket/zerosend_test.c

Modified: user/ngie/more-tests/tests/sys/socket/reconnect_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/reconnect_test.c	Thu Apr 16 03:39:33 2015	(r281585)
+++ user/ngie/more-tests/tests/sys/socket/reconnect_test.c	Thu Apr 16 05:37:19 2015	(r281586)
@@ -104,7 +104,7 @@ cleanup(void)
 }
 
 int
-main()
+main(void)
 {
     int s_sock1, s_sock2, c_sock;
 

Modified: user/ngie/more-tests/tests/sys/socket/sigpipe_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/sigpipe_test.c	Thu Apr 16 03:39:33 2015	(r281585)
+++ user/ngie/more-tests/tests/sys/socket/sigpipe_test.c	Thu Apr 16 05:37:19 2015	(r281586)
@@ -51,6 +51,7 @@
  *
  * For the purposes of testing TCP, an unused port number must be specified.
  */
+static void usage(void) __dead2;
 static void
 usage(void)
 {

Modified: user/ngie/more-tests/tests/sys/socket/unix_gc_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/unix_gc_test.c	Thu Apr 16 03:39:33 2015	(r281585)
+++ user/ngie/more-tests/tests/sys/socket/unix_gc_test.c	Thu Apr 16 05:37:19 2015	(r281586)
@@ -752,7 +752,7 @@ recursion(void)
 
 #define	RMDIR	"rm -Rf "
 int
-main(int argc, char *argv[])
+main(void)
 {
 	char cmd[sizeof(RMDIR) + PATH_MAX];
 	int serrno;

Modified: user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c	Thu Apr 16 03:39:33 2015	(r281585)
+++ user/ngie/more-tests/tests/sys/socket/unix_passfd_test.c	Thu Apr 16 05:37:19 2015	(r281586)
@@ -136,11 +136,11 @@ sendfd_payload(int sockfd, int sendfd,
 }
 
 static void
-sendfd(int sockfd, int sendfd)
+sendfd(int sock_fd, int send_fd)
 {
 	char ch;
 
-	return (sendfd_payload(sockfd, sendfd, &ch, sizeof(ch)));
+	return (sendfd_payload(sock_fd, send_fd, &ch, sizeof(ch)));
 }
 
 static void
@@ -185,11 +185,11 @@ recvfd_payload(int sockfd, int *recvfd, 
 }
 
 static void
-recvfd(int sockfd, int *recvfd)
+recvfd(int sock_fd, int *recv_fd)
 {
 	char ch;
 
-	return (recvfd_payload(sockfd, recvfd, &ch, sizeof(ch)));
+	return (recvfd_payload(sock_fd, recv_fd, &ch, sizeof(ch)));
 }
 
 /*

Modified: user/ngie/more-tests/tests/sys/socket/zerosend_test.c
==============================================================================
--- user/ngie/more-tests/tests/sys/socket/zerosend_test.c	Thu Apr 16 03:39:33 2015	(r281585)
+++ user/ngie/more-tests/tests/sys/socket/zerosend_test.c	Thu Apr 16 05:37:19 2015	(r281586)
@@ -226,7 +226,7 @@ static int fd[3];
 static void
 close_fds(int *fdp)
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < nitems(fdp); i++)
 		close(fdp[i]);