Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 4e8124f853b3fa9a36f1c884416d48a4a971b78a..0cdc0894ae207be6f674c8ca963462c7af423b7f 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -7,7 +7,6 @@
 enum fio_opt_type {
        FIO_OPT_STR = 0,
        FIO_OPT_STR_VAL,
-       FIO_OPT_STR_VAL_INT,
        FIO_OPT_STR_VAL_TIME,
        FIO_OPT_STR_STORE,
        FIO_OPT_RANGE,
@@ -26,6 +25,7 @@ struct value_pair {
        const char *help;               /* help text for sub option */
 };
 
+#define OPT_LEN_MAX    1024
 #define PARSE_MAX_VP   16
 
 /*
@@ -42,6 +42,7 @@ struct fio_option {
        unsigned int maxval;            /* max and min value */
        int minval;
        int neg;                        /* negate value stored */
+       int prio;
        void *cb;                       /* callback */
        const char *help;               /* help text for option */
        const char *def;                /* default setting */
@@ -52,6 +53,7 @@ struct fio_option {
 typedef int (str_cb_fn)(void *, char *);
 
 extern int parse_option(const char *, struct fio_option *, void *);
+extern void sort_options(char **, struct fio_option *, int);
 extern int parse_cmd_option(const char *t, const char *l, struct fio_option *, void *);
 extern int show_cmd_help(struct fio_option *, const char *);
 extern void fill_default_options(void *, struct fio_option *);