Fix g++ warning about void* used in arithmetic

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 66b1850ae9e753243e6289156c299bee79c447dc..1009252e4a254f80605416f14b05cc0587b72d72 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -28,7 +28,7 @@ struct value_pair {
        const char *ival;               /* string option */
        unsigned int oval;              /* output value */
        const char *help;               /* help text for sub option */
-       int or;                         /* OR value */
+       int orval;                      /* OR value */
        void *cb;                       /* sub-option callback */
 };
 
@@ -100,7 +100,17 @@ 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)  ((void *) start + (offset))
+#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)
+{
+       if (o->prof_opts)
+               return __td_var(o->prof_opts, offset);
+
+       return __td_var(to, offset);
+}
 
 static inline int parse_is_percent(unsigned long long val)
 {