From e42b01eba09c9d2f5e943b67eaf66c8a443c230f Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 5 May 2011 12:05:10 -0600 Subject: [PATCH] Revert "parser: get rid of useless is_time variable" This reverts commit 1a1137d9ba2603e295aaac579777ab0d3524faa6. --- parse.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/parse.c b/parse.c index 585fb7e0..1e6a5224 100644 --- a/parse.c +++ b/parse.c @@ -310,7 +310,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, long long ull, *ullp; long ul1, ul2; char **cp; - int ret = 0; + int ret = 0, is_time = 0; dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name, o->type, ptr); @@ -358,14 +358,17 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, ret = fn(data, ptr); break; } - case FIO_OPT_STR_VAL_TIME: { - fio_opt_str_val_fn *fn; - - ret = check_str_time(ptr, &ull); + case FIO_OPT_STR_VAL_TIME: + is_time = 1; case FIO_OPT_INT: - case FIO_OPT_STR_VAL: + case FIO_OPT_STR_VAL: { + fio_opt_str_val_fn *fn = o->cb; + + if (is_time) + ret = check_str_time(ptr, &ull); + else + ret = check_str_bytes(ptr, &ull, data); - ret = check_str_bytes(ptr, &ull, data); if (ret) break; @@ -380,7 +383,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, return 1; } - fn = o->cb; if (fn) ret = fn(data, &ull); else { -- 2.25.1