summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
18918a0)
use obtuse local variable names in macros to avoid
interfering with global name space
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
*/
#define COMMAND_PARSE_NUMBER(type, in, out) \
do { \
*/
#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); \
command_print(CMD_CTX, stringify(out) \
" option value ('%s') is not valid", in); \
+ return retval_macro_tmp; \
#define COMMAND_PARSE_BOOL(in, out, on, off) \
do { \
bool value; \
#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); \
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_macro_tmp; \
} \
out = value; \
} while (0)
} \
out = value; \
} while (0)