parse: get rid of __td_var()

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 3ba804797fe1c23658fc1f51bdd82ac8d2287a51..62fd9706816873f4a2909384cd973568ffbc28a0 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -1,6 +1,7 @@
 #ifndef FIO_PARSE_H
 #define FIO_PARSE_H
 
+#include <inttypes.h>
 #include "flist.h"
 
 /*
@@ -19,6 +20,7 @@ enum fio_opt_type {
        FIO_OPT_FLOAT_LIST,
        FIO_OPT_STR_SET,
        FIO_OPT_DEPRECATED,
+       FIO_OPT_UNSUPPORTED,
 };
 
 /*
@@ -69,8 +71,8 @@ struct fio_option {
        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 */
+       uint64_t category;              /* what type of option */
+       uint64_t group;                 /* who to group with */
        void *gui_data;
        int is_seconds;                 /* time value with seconds base */
        int is_time;                    /* time based value */
@@ -107,16 +109,18 @@ typedef int (fio_opt_str_val_fn)(void *, long long *);
 typedef int (fio_opt_int_fn)(void *, int *);
 typedef int (fio_opt_str_set_fn)(void *);
 
-#define __td_var(start, offset)        ((char *) start + (offset))
-
 struct thread_options;
 static inline void *td_var(struct thread_options *to, struct fio_option *o,
                           unsigned int offset)
 {
+       void *ret;
+
        if (o->prof_opts)
-               return __td_var(o->prof_opts, offset);
+               ret = o->prof_opts;
+       else
+               ret = to;
 
-       return __td_var(to, offset);
+       return ret + offset;
 }
 
 static inline int parse_is_percent(unsigned long long val)