openocd: fix simple cases of Yoda condition
There are ~900 Yoda conditions to be aligned to the coding style.
For recurrent Yoda conditions it's preferable using a trivial
script in order to minimize the review effort.
E.g. comparison of uppercase macro/enum with lowercase variable:
- ...(ERROR_OK == retval)...
+ ...(retval == ERROR_OK)...
Patch generated automatically with the command:
sed -i \
's/(\([A-Z][A-Z0-9_]*\) \([=!]=\) \([a-z][a-z0-9_]*\))/(\3 \2 \1)/g' \
$(find src/ -type f)
While there, remove the braces {} around a single statement block
to prevent warning from checkpatch.
Change-Id: If585b0a4b4578879c87b2dd74d9e0025e275ec6b
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6354
Tested-by: jenkins
Reviewed-by: Xiang W <wxjstz@126.com>
This commit is contained in:
@@ -394,11 +394,11 @@ int __register_commands(struct command_context *cmd_ctx, const char *cmd_prefix,
|
||||
} else {
|
||||
retval = __register_commands(cmd_ctx, cmd_prefix, cr->chain, data, override_target);
|
||||
}
|
||||
if (ERROR_OK != retval)
|
||||
if (retval != ERROR_OK)
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (ERROR_OK != retval) {
|
||||
if (retval != ERROR_OK) {
|
||||
for (unsigned j = 0; j < i; j++)
|
||||
unregister_command(cmd_ctx, cmd_prefix, cmds[j].name);
|
||||
}
|
||||
@@ -1171,7 +1171,7 @@ COMMAND_HANDLER(handle_sleep_command)
|
||||
|
||||
unsigned long duration = 0;
|
||||
int retval = parse_ulong(CMD_ARGV[0], &duration);
|
||||
if (ERROR_OK != retval)
|
||||
if (retval != ERROR_OK)
|
||||
return retval;
|
||||
|
||||
if (!busy) {
|
||||
@@ -1354,11 +1354,11 @@ void process_jim_events(struct command_context *cmd_ctx)
|
||||
LOG_ERROR("Invalid command argument"); \
|
||||
return ERROR_COMMAND_ARGUMENT_INVALID; \
|
||||
} \
|
||||
if ((max == *ul) && (ERANGE == errno)) { \
|
||||
if ((max == *ul) && (errno == ERANGE)) { \
|
||||
LOG_ERROR("Argument overflow"); \
|
||||
return ERROR_COMMAND_ARGUMENT_OVERFLOW; \
|
||||
} \
|
||||
if (min && (min == *ul) && (ERANGE == errno)) { \
|
||||
if (min && (min == *ul) && (errno == ERANGE)) { \
|
||||
LOG_ERROR("Argument underflow"); \
|
||||
return ERROR_COMMAND_ARGUMENT_UNDERFLOW; \
|
||||
} \
|
||||
@@ -1374,7 +1374,7 @@ DEFINE_PARSE_NUM_TYPE(_llong, long long, strtoll, LLONG_MIN, LLONG_MAX)
|
||||
{ \
|
||||
functype n; \
|
||||
int retval = parse ## funcname(str, &n); \
|
||||
if (ERROR_OK != retval) \
|
||||
if (retval != ERROR_OK) \
|
||||
return retval; \
|
||||
if (n > max) \
|
||||
return ERROR_COMMAND_ARGUMENT_OVERFLOW; \
|
||||
|
||||
Reference in New Issue
Block a user