From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Mon, 14 Jun 2010 10:10:35 +0000 (+0200)
Subject: helper: fix -Wshadow warning in number parsing
X-Git-Tag: v0.5.0-rc1~637
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=f3ae52cace69f9568bac719d50af3a62993e96ad;hp=18918a0423e04180f580a4a9453e190488aab17d

helper: fix -Wshadow warning in number parsing

use obtuse local variable names in macros to avoid
interfering with global name space

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/helper/command.h b/src/helper/command.h
index 2c192416ef..1bf2cb48cb 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -387,11 +387,11 @@ DECLARE_PARSE_WRAPPER(_s8, int8_t);
  */
 #define COMMAND_PARSE_NUMBER(type, in, out) \
 	do { \
-		int retval = parse_##type(in, &(out)); \
-		if (ERROR_OK != retval) { \
+		int retval_macro_tmp = parse_##type(in, &(out)); \
+		if (ERROR_OK != retval_macro_tmp) { \
 			command_print(CMD_CTX, stringify(out) \
 				" option value ('%s') is not valid", in); \
-			return retval; \
+			return retval_macro_tmp; \
 		} \
 	} while (0)
 
@@ -404,13 +404,13 @@ DECLARE_PARSE_WRAPPER(_s8, int8_t);
 #define COMMAND_PARSE_BOOL(in, out, on, off) \
 	do { \
 		bool value; \
-		int retval = command_parse_bool_arg(in, &value); \
-		if (ERROR_OK != retval) { \
+		int retval_macro_tmp = command_parse_bool_arg(in, &value); \
+		if (ERROR_OK != retval_macro_tmp) { \
 			command_print(CMD_CTX, stringify(out) \
 				" option value ('%s') is not valid", in); \
 			command_print(CMD_CTX, "  choices are '%s' or '%s'", \
 				on, off); \
-			return retval; \
+			return retval_macro_tmp; \
 		} \
 		out = value; \
 	} while (0)