Move options_mem_dupe() to parse.c

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 77450ef582403776ef32a93a645468f2e5b941b3..54e3948338fb5c2ab9a8c5921c2eaddc353dee83 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -20,6 +20,7 @@ enum fio_opt_type {
        FIO_OPT_FLOAT_LIST,
        FIO_OPT_STR_SET,
        FIO_OPT_DEPRECATED,
+       FIO_OPT_UNSUPPORTED,
 };
 
 /*
@@ -79,15 +80,13 @@ struct fio_option {
        int pow2;                       /* must be a power-of-2 */
 };
 
-typedef int (str_cb_fn)(void *, char *);
-
 extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *, struct flist_head *);
 extern void sort_options(char **, struct fio_option *, int);
 extern int parse_cmd_option(const char *t, const char *l, struct fio_option *, void *, struct flist_head *);
 extern int show_cmd_help(struct fio_option *, const char *);
 extern void fill_default_options(void *, struct fio_option *);
-extern void option_init(struct fio_option *);
 extern void options_init(struct fio_option *);
+extern void options_mem_dupe(struct fio_option *, void *);
 extern void options_free(struct fio_option *, void *);
 
 extern void strip_blank_front(char **);
@@ -106,18 +105,19 @@ extern int string_distance_ok(const char *s1, int dist);
 typedef int (fio_opt_str_fn)(void *, const char *);
 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 (char *) ret + offset;
 }
 
 static inline int parse_is_percent(unsigned long long val)