commit e42b01eba09c9d2f5e943b67eaf66c8a443c230f
author Jens Axboe <jaxboe@fusionio.com> Thu May 05 12:05:10 2011 -0600
committer Jens Axboe <jaxboe@fusionio.com> Thu May 05 12:05:10 2011 -0600
tree d2af420f8178eb74e4e9d7fbef98acd4522a4c0f
parent deaa1af25d75d6989d15966b4579bc158df856f0

Revert "parser: get rid of useless is_time variable"

This reverts commit 1a1137d9ba2603e295aaac579777ab0d3524faa6.

parse.c

diff --git a/parse.c b/parse.c
index 585fb7e..1e6a522 100644
--- a/parse.c
+++ b/parse.c
@@ -310,7 +310,7 @@
 	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 @@
 			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;
 
-		ret = check_str_bytes(ptr, &ull, data);
+		if (is_time)
+			ret = check_str_time(ptr, &ull);
+		else
+			ret = check_str_bytes(ptr, &ull, data);
+
 		if (ret)
 			break;
 
@@ -380,7 +383,6 @@
 			return 1;
 		}
 
-		fn = o->cb;
 		if (fn)
 			ret = fn(data, &ull);
 		else {