From: Jens Axboe <axboe@fb.com>
Date: Wed, 12 Feb 2014 16:10:10 +0000 (-0700)
Subject: clang: fix warnings with clang build
X-Git-Tag: fio-2.1.6~47
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8271963e39a0a6bfee4d848e1fae4f4e27685204;p=fio.git

clang: fix warnings with clang build

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/fio.h b/fio.h
index 719b2f3b..cda46686 100644
--- a/fio.h
+++ b/fio.h
@@ -343,10 +343,10 @@ enum {
 
 #define __td_verror(td, err, msg, func)					\
 	do {								\
-		int __e = (err);						\
+		int ____e = (err);						\
 		if ((td)->error)					\
 			break;						\
-		(td)->error = __e;					\
+		(td)->error = ____e;					\
 		if (!(td)->first_error)					\
 			snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));		\
 	} while (0)
diff --git a/profiles/tiobench.c b/profiles/tiobench.c
index 99c88c45..7a7030af 100644
--- a/profiles/tiobench.c
+++ b/profiles/tiobench.c
@@ -113,7 +113,6 @@ static int tb_prep_cmdline(void)
 static struct profile_ops tiobench_profile = {
 	.name		= "tiobench",
 	.desc		= "tiotest/tiobench benchmark",
-	.options	= options,
 	.prep_cmd	= tb_prep_cmdline,
 	.cmdline	= tb_opts,
 	.options	= options,