Don't always print usage info
authorJens Axboe <jens.axboe@oracle.com>
Tue, 19 Feb 2008 19:16:57 +0000 (20:16 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 19 Feb 2008 19:16:57 +0000 (20:16 +0100)
For instance, when we ask for help don't complain about missing job.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
init.c

diff --git a/init.c b/init.c
index 92c5b8cda9bc157b4887508e370c76b18f5cc4fe..a7b0b6554b8f4d58ab3f6882bbffe2ebfbf3e951 100644 (file)
--- a/init.c
+++ b/init.c
@@ -815,7 +815,7 @@ struct debug_level debug_levels[] = {
        { },
 };
 
        { },
 };
 
-static void set_debug(const char *string)
+static int set_debug(const char *string)
 {
        struct debug_level *dl;
        char *p = (char *) string;
 {
        struct debug_level *dl;
        char *p = (char *) string;
@@ -831,10 +831,10 @@ static void set_debug(const char *string)
                        log_info("%s,", dl->name);
                }
                log_info("all\n");
                        log_info("%s,", dl->name);
                }
                log_info("all\n");
-               return;
+               return 1;
        } else if (!strcmp(string, "all")) {
                fio_debug = ~0UL;
        } else if (!strcmp(string, "all")) {
                fio_debug = ~0UL;
-               return;
+               return 0;
        }
 
        while ((opt = strsep(&p, ",")) != NULL) {
        }
 
        while ((opt = strsep(&p, ",")) != NULL) {
@@ -853,18 +853,20 @@ static void set_debug(const char *string)
                if (!found)
                        log_err("fio: debug mask %s not found\n", opt);
        }
                if (!found)
                        log_err("fio: debug mask %s not found\n", opt);
        }
+       return 0;
 }
 #else
 static void set_debug(const char *string)
 {
        log_err("fio: debug tracing not included in build\n");
 }
 #else
 static void set_debug(const char *string)
 {
        log_err("fio: debug tracing not included in build\n");
+       return 1;
 }
 #endif
 
 static int parse_cmd_line(int argc, char *argv[])
 {
        struct thread_data *td = NULL;
 }
 #endif
 
 static int parse_cmd_line(int argc, char *argv[])
 {
        struct thread_data *td = NULL;
-       int c, ini_idx = 0, lidx, ret = 0, bad_options = 0;
+       int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
 
        while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
                switch (c) {
 
        while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
                switch (c) {
@@ -909,12 +911,14 @@ static int parse_cmd_line(int argc, char *argv[])
                                eta_print = FIO_ETA_NEVER;
                        break;
                case 'd':
                                eta_print = FIO_ETA_NEVER;
                        break;
                case 'd':
-                       set_debug(optarg);
+                       if (set_debug(optarg))
+                               do_exit++;
                        break;
                case 'x':
                        if (!strcmp(optarg, "global")) {
                                log_err("fio: can't use global as only section\n");
                        break;
                case 'x':
                        if (!strcmp(optarg, "global")) {
                                log_err("fio: can't use global as only section\n");
-                               bad_options++;
+                               do_exit++;
+                               exit_val = 1;
                                break;
                        }
                        if (job_section)
                                break;
                        }
                        if (job_section)
@@ -952,13 +956,14 @@ static int parse_cmd_line(int argc, char *argv[])
                        break;
                }
                default:
                        break;
                }
                default:
-                       bad_options++;
+                       do_exit++;
+                       exit_val = 1;
                        break;
                }
        }
 
                        break;
                }
        }
 
-       if (bad_options)
-               exit(1);
+       if (do_exit)
+               exit(exit_val);
 
        if (td) {
                if (!ret)
 
        if (td) {
                if (!ret)