solaris: OpenSolaris already has the madvise advice defined

[fio.git] / init.c

diff --git a/init.c b/init.c
index 15adf38509cac27ba495e3cba58635db24dead53..df9e2a38883d0758ecd1cf1f5b201ca6f3caaf71 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.50-rc3";
+static char fio_version_string[] = "fio 1.50.1";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -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) {
@@ -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];
@@ -1157,7 +1155,7 @@ static int parse_cmd_line(int argc, char *argv[])
                        read_only = 1;
                        break;
                case 'v':
-                       /* already being printed, just quit */
+                       log_info("%s\n", fio_version_string);
                        exit(0);
                case 'e':
                        if (!strcmp("always", optarg))
@@ -1251,8 +1249,6 @@ int parse_options(int argc, char *argv[])
        f_out = stdout;
        f_err = stderr;
 
-       log_info("%s\n", fio_version_string);
-
        fio_options_fill_optstring();
        fio_options_dup_and_init(l_opts);
 
@@ -1291,5 +1287,6 @@ int parse_options(int argc, char *argv[])
                fio_gtod_cpu = def_thread.o.gtod_cpu;
        }
 
+       log_info("%s\n", fio_version_string);
        return 0;
 }