auracaster/sw_openocd
3
0
Fork 0
forked from auracaster/openocd
Code Pull Requests Activity

openocd: fix simple cases of NULL comparison

Browse Source 
There are more than 1000 NULL comparisons to be aligned to the
coding style.
For recurrent NULL comparison it's preferable using trivial
scripts in order to minimize the review effort.

Patch generated automatically with the command:
	sed -i PATTERN $(find src/ -type f)
where PATTERN is in the list:
	's/(\([a-z][a-z0-9_]*\) == NULL)/(!\1)/g'
	's/(\([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\) == NULL)/(!\1)/g'
	's/(\([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\) == NULL)/(!\1)/g'

	's/(\([a-z][a-z0-9_]*\) != NULL)/(\1)/g'
	's/(\([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\) != NULL)/(\1)/g'
	's/(\([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\) != NULL)/(\1)/g'

	's/(NULL == \([a-z][a-z0-9_]*\))/(!\1)/g'
	's/(NULL == \([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\))/(!\1)/g'
	's/(NULL == \([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\))/(!\1)/g'

	's/(NULL != \([a-z][a-z0-9_]*\))/(\1)/g'
	's/(NULL != \([a-z][a-z0-9_]*->[a-z][a-z0-9_]*\))/(\1)/g'
	's/(NULL != \([a-z][a-z0-9_]*\.[a-z][a-z0-9_]*\))/(\1)/g'

Change-Id: Ida103e325d6d0600fb69c0b7a1557ee969db4417
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6350
Tested-by: jenkins
This commit is contained in:
Antonio Borneo
2021-07-03 18:51:20 +02:00
parent b159f5cded
commit 08ee7bb982
166 changed files with 856 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/riscv/batch.c
View File

@@ -183,7 +183,7 @@ void dump_field(int idle, const struct scan_field *field)
if (debug_level < LOG_LVL_DEBUG)
return;
assert(field->out_value != NULL);
assert(field->out_value);
uint64_t out = buf_get_u64(field->out_value, 0, field->num_bits);
unsigned int out_op = get_field(out, DTM_DMI_OP);
unsigned int out_data = get_field(out, DTM_DMI_DATA);

14
src/target/riscv/riscv.c
View File

@@ -951,7 +951,7 @@ static int old_or_new_riscv_step(struct target *target, int current,
{
RISCV_INFO(r);
LOG_DEBUG("handle_breakpoints=%d", handle_breakpoints);
if (r->is_halted == NULL)
if (!r->is_halted)
return oldriscv_step(target, current, address, handle_breakpoints);
else
return riscv_openocd_step(target, current, address, handle_breakpoints);
@@ -975,7 +975,7 @@ static int riscv_examine(struct target *target)
LOG_DEBUG(" version=0x%x", info->dtm_version);
struct target_type *tt = get_target_type(target);
if (tt == NULL)
if (!tt)
return ERROR_FAIL;
int result = tt->init_target(info->cmd_ctx, target);
@@ -994,7 +994,7 @@ static int oldriscv_poll(struct target *target)
static int old_or_new_riscv_poll(struct target *target)
{
RISCV_INFO(r);
if (r->is_halted == NULL)
if (!r->is_halted)
return oldriscv_poll(target);
else
return riscv_openocd_poll(target);
@@ -1049,7 +1049,7 @@ int halt_go(struct target *target)
{
riscv_info_t *r = riscv_info(target);
int result;
if (r->is_halted == NULL) {
if (!r->is_halted) {
struct target_type *tt = get_target_type(target);
result = tt->halt(target);
} else {
@@ -1071,7 +1071,7 @@ int riscv_halt(struct target *target)
{
RISCV_INFO(r);
if (r->is_halted == NULL) {
if (!r->is_halted) {
struct target_type *tt = get_target_type(target);
return tt->halt(target);
}
@@ -1297,7 +1297,7 @@ static int resume_go(struct target *target, int current,
{
riscv_info_t *r = riscv_info(target);
int result;
if (r->is_halted == NULL) {
if (!r->is_halted) {
struct target_type *tt = get_target_type(target);
result = tt->resume(target, current, address, handle_breakpoints,
debug_execution);
@@ -3056,7 +3056,7 @@ void riscv_set_rtos_hartid(struct target *target, int hartid)
int riscv_count_harts(struct target *target)
{
if (target == NULL)
if (!target)
return 1;
RISCV_INFO(r);
if (r == NULL || r->hart_count == NULL)