From: Jens Axboe <jaxboe@fusionio.com>
Date: Sun, 27 Mar 2011 18:43:20 +0000 (+0200)
Subject: parser: get rid of useless is_time variable
X-Git-Tag: fio-1.52~11
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=1a1137d9ba2603e295aaac579777ab0d3524faa6;ds=inline

parser: get rid of useless is_time variable

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/parse.c b/parse.c
index bb138e55..e9eb7385 100644
--- a/parse.c
+++ b/parse.c
@@ -309,7 +309,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, is_time = 0;
+	int ret = 0;
 
 	dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
 							o->type, ptr);
@@ -357,17 +357,14 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			ret = fn(data, ptr);
 		break;
 	}
-	case FIO_OPT_STR_VAL_TIME:
-		is_time = 1;
-	case FIO_OPT_INT:
-	case FIO_OPT_STR_VAL: {
-		fio_opt_str_val_fn *fn = o->cb;
+	case FIO_OPT_STR_VAL_TIME: {
+		fio_opt_str_val_fn *fn;
 
-		if (is_time)
-			ret = check_str_time(ptr, &ull);
-		else
-			ret = check_str_bytes(ptr, &ull, data);
+		ret = check_str_time(ptr, &ull);
+	case FIO_OPT_INT:
+	case FIO_OPT_STR_VAL:
 
+		ret = check_str_bytes(ptr, &ull, data);
 		if (ret)
 			break;
 
@@ -382,6 +379,7 @@ 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 {