parse: get rid of raw option offsets

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 7fee4fa423d900a21296a4af37c96a014dcb983f..66b1850ae9e753243e6289156c299bee79c447dc 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -49,7 +49,6 @@ struct fio_option {
        unsigned int off4;
        unsigned int off5;
        unsigned int off6;
-       void *roff1, *roff2, *roff3, *roff4, *roff5, *roff6;
        unsigned int maxval;            /* max and min value */
        int minval;
        double maxfp;                   /* max and min floating value */
@@ -69,6 +68,7 @@ struct fio_option {
        struct fio_option *inv_opt;     /* cached lookup */
        int (*verify)(struct fio_option *, void *);
        const char *prof_name;          /* only valid for specific profile */
+       void *prof_opts;
        unsigned int category;          /* what type of option */
        unsigned int group;             /* who to group with */
        void *gui_data;
@@ -76,7 +76,7 @@ struct fio_option {
 
 typedef int (str_cb_fn)(void *, char *);
 
-extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *);
+extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *, int);
 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 *);
@@ -89,6 +89,8 @@ extern void strip_blank_front(char **);
 extern void strip_blank_end(char *);
 extern int str_to_decimal(const char *, long long *, int, void *);
 extern int check_str_bytes(const char *p, long long *val, void *data);
+extern int check_str_time(const char *p, long long *val);
+extern int str_to_float(const char *str, double *val);
 
 /*
  * Handlers for the options
@@ -100,13 +102,6 @@ typedef int (fio_opt_str_set_fn)(void *);
 
 #define td_var(start, offset)  ((void *) start + (offset))
 
-#ifndef min
-#define min(a, b)      ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b)      ((a) > (b) ? (a) : (b))
-#endif
-
 static inline int parse_is_percent(unsigned long long val)
 {
        return val <= -1ULL && val >= (-1ULL - 100ULL);