Merge branch 'histogram-client-server' of https://github.com/cronburg/fio

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 62fd9706816873f4a2909384cd973568ffbc28a0..7ba4e37b984bd46b17092acbc0c03d120f0c1f57 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -80,14 +80,11 @@ 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_free(struct fio_option *, void *);
 
@@ -107,7 +104,6 @@ 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 *);
 
 struct thread_options;
 static inline void *td_var(struct thread_options *to, struct fio_option *o,
@@ -120,7 +116,7 @@ static inline void *td_var(struct thread_options *to, struct fio_option *o,
        else
                ret = to;
 
-       return ret + offset;
+       return (char *) ret + offset;
 }
 
 static inline int parse_is_percent(unsigned long long val)