Get rid of shadow declarations

[fio.git] / init.c

diff --git a/init.c b/init.c
index bce284664c8f2e965f19e8db16dd3f813cc0d360..c3f23f93c1926ee5b9b35c3223b7ec1a1f520519 100644 (file)
--- a/init.c
+++ b/init.c
@@ -248,7 +248,7 @@ static int fixed_block_size(struct thread_options *o)
 static int fixup_options(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
-       int ret;
+       int ret = 0;
 
 #ifndef FIO_HAVE_PSHARED_MUTEX
        if (!o->use_thread) {
@@ -381,7 +381,7 @@ static int fixup_options(struct thread_data *td)
                                "pre-populated the file\n");
                        ret = warnings_fatal;
                }
-               if (td_write(td) && o->numjobs > 1) {
+               if (td_write(td) && o->do_verify && o->numjobs > 1) {
                        log_info("Multiple writers may overwrite blocks that "
                                "belong to other jobs. This can cause "
                                "verification failures.\n");
@@ -1039,8 +1039,6 @@ static int set_debug(const char *string)
        int i;
 
        if (!strcmp(string, "?") || !strcmp(string, "help")) {
-               int i;
-
                log_info("fio: dumping debug options:");
                for (i = 0; debug_levels[i].name; i++) {
                        dl = &debug_levels[i];