From 0ab8db8943acc6b9ea778735563bfad2a79e8ddd Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 18 Oct 2006 17:16:23 +0200
Subject: [PATCH 1/1] [PATCH] Make fio -W clean again

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
 Makefile    |  2 +-
 filesetup.c |  5 ++---
 fio.c       |  4 ++--
 fio.h       |  2 +-
 init.c      | 11 +++++------
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index b9a72811..9dc4729f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC	= gcc
-CFLAGS	= -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS	= -W -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 PROGS	= fio
 SCRIPTS = fio_generate_plots
 
diff --git a/filesetup.c b/filesetup.c
index 04052bf3..7ea5714a 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -358,11 +358,10 @@ int setup_files(struct thread_data *td)
 
 void close_files(struct thread_data *td)
 {
+	struct fio_file *f;
 	int i;
 
-	for (i = 0; i < td->nr_files; i++) {
-		struct fio_file *f = &td->files[i];
-
+	for_each_file(td, f, i) {
 		if (f->fd != -1) {
 			if (td->unlink && td->filetype == FIO_TYPE_FILE)
 				unlink(f->file_name);
diff --git a/fio.c b/fio.c
index 2b760ddd..f9b7e02f 100644
--- a/fio.c
+++ b/fio.c
@@ -277,7 +277,7 @@ static int get_rw_ddir(struct thread_data *td)
 		 * Check if it's time to seed a new data direction.
 		 */
 		if (elapsed >= td->rwmixcycle) {
-			int v;
+			unsigned int v;
 			long r;
 
 			r = os_random_long(&td->rwmix_state);
@@ -422,7 +422,7 @@ static inline void td_set_runstate(struct thread_data *td, int runstate)
 
 static struct fio_file *get_next_file(struct thread_data *td)
 {
-	int old_next_file = td->next_file;
+	unsigned int old_next_file = td->next_file;
 	struct fio_file *f;
 
 	do {
diff --git a/fio.h b/fio.h
index e279574a..ca00a435 100644
--- a/fio.h
+++ b/fio.h
@@ -540,6 +540,6 @@ extern void close_ioengine(struct thread_data *);
 #define fio_unused	__attribute((__unused__))
 
 #define for_each_file(td, f, i)	\
-	for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f) = &(td)->files[(i)])
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f) = &(td)->files[(i)])
 
 #endif
diff --git a/init.c b/init.c
index 91a1d507..fae35f3c 100644
--- a/init.c
+++ b/init.c
@@ -275,6 +275,7 @@ int init_random_state(struct thread_data *td)
 {
 	unsigned long seeds[4];
 	int fd, num_maps, blocks, i;
+	struct fio_file *f;
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
@@ -300,9 +301,7 @@ int init_random_state(struct thread_data *td)
 	if (td->rand_repeatable)
 		seeds[3] = DEF_RANDSEED;
 
-	for (i = 0; i < td->nr_files; i++) {
-		struct fio_file *f = &td->files[i];
-
+	for_each_file(td, f, i) {
 		blocks = (f->file_size + td->min_bs - 1) / td->min_bs;
 		num_maps = blocks / BLOCKS_PER_MAP;
 		f->file_map = malloc(num_maps * sizeof(long));
@@ -1056,7 +1055,7 @@ static int fill_def_thread(void)
 	return 0;
 }
 
-static void usage(char *name)
+static void usage(void)
 {
 	printf("%s\n", fio_version_string);
 	printf("\t-o Write output to file\n");
@@ -1099,7 +1098,7 @@ static int parse_cmd_line(int argc, char *argv[])
 				idx = optind;
 				break;
 			case 'h':
-				usage(argv[0]);
+				usage();
 				exit(0);
 			case 'v':
 				printf("%s\n", fio_version_string);
@@ -1183,7 +1182,7 @@ int parse_options(int argc, char *argv[])
 	job_files = parse_cmd_line(argc, argv);
 	if (!job_files) {
 		log_err("Need job file(s)\n");
-		usage(argv[0]);
+		usage();
 		return 1;
 	}
 
-- 
2.25.1