Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 12 Oct 2011 11:38:44 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r226300 - in projects/stress2/testcases: pty run shm socket swap syscall sysctl tcp thr1 thr2 udp
Message-ID:  <201110121138.p9CBciKs064501@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pho
Date: Wed Oct 12 11:38:44 2011
New Revision: 226300
URL: http://svn.freebsd.org/changeset/base/226300

Log:
  Issues found by adding -Wextra to CFLAGS.

Modified:
  projects/stress2/testcases/pty/pty.c
  projects/stress2/testcases/run/run.c
  projects/stress2/testcases/shm/shm.c
  projects/stress2/testcases/socket/socket.c
  projects/stress2/testcases/swap/swap.c
  projects/stress2/testcases/syscall/syscall.c
  projects/stress2/testcases/sysctl/sysctl.c
  projects/stress2/testcases/tcp/tcp.c
  projects/stress2/testcases/thr1/thr1.c
  projects/stress2/testcases/thr2/thr2.c
  projects/stress2/testcases/udp/udp.c

Modified: projects/stress2/testcases/pty/pty.c
==============================================================================
--- projects/stress2/testcases/pty/pty.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/pty/pty.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #define TXT "Hello, world!"
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
         return (0);
 }

Modified: projects/stress2/testcases/run/run.c
==============================================================================
--- projects/stress2/testcases/run/run.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/run/run.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -46,7 +46,7 @@ static char *av[MAXAV];
 static int loop = 1;
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	return (0);
 }

Modified: projects/stress2/testcases/shm/shm.c
==============================================================================
--- projects/stress2/testcases/shm/shm.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/shm/shm.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -57,7 +57,7 @@ size_t	pgsize;
 pid_t	pid;
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	int seed;
 

Modified: projects/stress2/testcases/socket/socket.c
==============================================================================
--- projects/stress2/testcases/socket/socket.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/socket/socket.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -67,14 +67,12 @@ reader(void) {
 
 static void
 writer(void) {
-	int i, *buf, r;
+	int i, *buf;
 
-	if (r < 0)
-		err(1, "connect(), %s:%d", __FILE__, __LINE__);
 
 	if ((buf = malloc(bufsize)) == NULL)
 			err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__);
-	for (i = 0; i < bufsize / sizeof(int); i++)
+	for (i = 0; i < bufsize / (int)sizeof(int); i++)
 		buf[i] = i;
 
 	for (;;) {

Modified: projects/stress2/testcases/swap/swap.c
==============================================================================
--- projects/stress2/testcases/swap/swap.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/swap/swap.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -45,7 +45,7 @@ static unsigned long size;
 int
 setup(int nb)
 {
-	int pct;
+	int pct = 0;
 	unsigned long mem;
 	int64_t  swapinfo = 0;
 	struct rlimit rlp;
@@ -101,8 +101,8 @@ int
 test(void)
 {
 	char *c;
-	int i, page;
-	unsigned long oldsize = size;
+	int page;
+	unsigned long i, oldsize = size;
 	time_t start;
 
 	c = malloc(size);
@@ -118,7 +118,7 @@ test(void)
 	while (done_testing == 0 &&
 			(time(NULL) - start) < op->run_time) {
 		i = 0;
-		while (i < size && done_testing == 0) {
+		while (i < (int)size && done_testing == 0) {
 			c[i] = 0;
 			i += page;
 		}

Modified: projects/stress2/testcases/syscall/syscall.c
==============================================================================
--- projects/stress2/testcases/syscall/syscall.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/syscall/syscall.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -65,7 +65,7 @@ static int ignore[] = {
 };
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	int i;
 	struct rlimit rl;
@@ -80,7 +80,7 @@ setup(int nb)
 
 	if (op->argc == 1) {
 		num = atoi(op->argv[0]);
-		for (i = 0; i < sizeof(ignore) / sizeof(ignore[0]); i++)
+		for (i = 0; i < (int)sizeof(ignore) / (int)sizeof(ignore[0]); i++)
 			if (num == ignore[i]) {
 				printf("syscall %d is marked a no test!\n", num);
 				exit(1);
@@ -89,7 +89,7 @@ setup(int nb)
 		num = 0;
 		while (num == 0) {
 			num = random_int(0, SYS_MAXSYSCALL);
-			for (i = 0; i < sizeof(ignore) / sizeof(ignore[0]); i++)
+			for (i = 0; i < (int)sizeof(ignore) / (int)sizeof(ignore[0]); i++)
 				if (num == ignore[i]) {
 					num = 0;
 					break;

Modified: projects/stress2/testcases/sysctl/sysctl.c
==============================================================================
--- projects/stress2/testcases/sysctl/sysctl.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/sysctl/sysctl.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include "stress.h"
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	return (0);
 }

Modified: projects/stress2/testcases/tcp/tcp.c
==============================================================================
--- projects/stress2/testcases/tcp/tcp.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/tcp/tcp.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -134,7 +134,7 @@ writer(void) {
 
 	if ((buf = malloc(bufsize)) == NULL)
 			err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__);
-	for (i = 0; i < bufsize / sizeof(int); i++)
+	for (i = 0; i < bufsize / (int)sizeof(int); i++)
 		buf[i] = i;
 
 	for (;;) {

Modified: projects/stress2/testcases/thr1/thr1.c
==============================================================================
--- projects/stress2/testcases/thr1/thr1.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/thr1/thr1.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #define NTHREADS 256
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	return (0);
 }
@@ -53,7 +53,7 @@ cleanup(void)
 }
 
 void *
-thr_routine(void *arg)
+thr_routine(void *arg __unused)
 {
 	(void) getpid();
 	return (0);

Modified: projects/stress2/testcases/thr2/thr2.c
==============================================================================
--- projects/stress2/testcases/thr2/thr2.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/thr2/thr2.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 volatile int done = 0;
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	return (0);
 }
@@ -55,13 +55,13 @@ cleanup(void)
 }
 
 void *
-thr1(void *arg)
+thr1(void *arg __unused)
 {
 	return (0);
 }
 
 void *
-thr2(void *arg)
+thr2(void *arg __unused)
 {
 	while (done == 0)
 		pthread_yield();

Modified: projects/stress2/testcases/udp/udp.c
==============================================================================
--- projects/stress2/testcases/udp/udp.c	Wed Oct 12 11:34:14 2011	(r226299)
+++ projects/stress2/testcases/udp/udp.c	Wed Oct 12 11:38:44 2011	(r226300)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 static int bufsize;
 
 int
-setup(int nb)
+setup(int nb __unused)
 {
 	bufsize = 2 << random_int(1, 12);
 	return (0);
@@ -86,7 +86,7 @@ test(void)
 	} else {
 		sock_in.sin_family = AF_INET;
 		sock_in.sin_addr.s_addr = inet_addr(hostname);
-		if (sock_in.sin_addr.s_addr == -1) {
+		if (sock_in.sin_addr.s_addr == INADDR_NONE) {
 			err(1, "host: %s", hostname);
 		}
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110121138.p9CBciKs064501>