imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openocd: manually remove NULL comparisons 

For the remaining NULL comparisons, remove then manually.

While there, make more readable a loop, by moving the assigment
out of the loop condition.

Change-Id: I44193aaa95813156a3a79c16b80e1ad333dc1eaf
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6353
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2021-07-03 22:10:55 +02:00
parent 0a1f904707
commit 54e699b260
10 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/flash/nor/tcl.c
View File

@ -1276,7 +1276,7 @@ COMMAND_HANDLER(handle_flash_bank_command)
}
/* check the flash bank name is unique */
if (get_flash_bank_by_name_noprobe(bank_name) != NULL) {
if (get_flash_bank_by_name_noprobe(bank_name)) {
/* flash bank name already exists */
LOG_ERROR("flash bank name '%s' already exists", bank_name);
return ERROR_FAIL;

6
src/helper/command.c
View File

@ -815,9 +815,9 @@ static COMMAND_HELPER(command_help_show, struct help_entry *c,
/* If the match string occurs anywhere, we print out
* stuff for this command. */
bool is_match = (strstr(c->cmd_name, cmd_match) != NULL) ||
((c->usage) && (strstr(c->usage, cmd_match) != NULL)) ||
((c->help) && (strstr(c->help, cmd_match) != NULL));
bool is_match = strstr(c->cmd_name, cmd_match) ||
(c->usage && strstr(c->usage, cmd_match)) ||
(c->help && strstr(c->help, cmd_match));
if (is_match) {
if (c->usage && strlen(c->usage) > 0) {

2
src/helper/fileio.c
View File

@ -208,7 +208,7 @@ int fileio_read_u32(struct fileio *fileio, uint32_t *data)
static int fileio_local_fgets(struct fileio *fileio, size_t size, void *buffer)
{
if (fgets(buffer, size, fileio->file) == NULL)
if (!fgets(buffer, size, fileio->file))
return ERROR_FILEIO_OPERATION_FAILED;
return ERROR_OK;

2
src/jtag/aice/aice_usb.c
View File

@ -2218,7 +2218,7 @@ static int aice_execute_custom_script(const char *script)
if (!script_fd) {
return ERROR_FAIL;
} else {
while (fgets(line_buffer, LINE_BUFFER_SIZE, script_fd) != NULL) {
while (fgets(line_buffer, LINE_BUFFER_SIZE, script_fd)) {
/* execute operations */
set_op = false;
op_str = strstr(line_buffer, "set");

14
src/jtag/core.c
View File

@ -1336,7 +1336,6 @@ out:
static int jtag_validate_ircapture(void)
{
struct jtag_tap *tap;
int total_ir_length = 0;
uint8_t *ir_test = NULL;
struct scan_field field;
uint64_t val;
@ -1344,11 +1343,12 @@ static int jtag_validate_ircapture(void)
int retval;
/* when autoprobing, accommodate huge IR lengths */
for (tap = NULL, total_ir_length = 0;
(tap = jtag_tap_next_enabled(tap)) != NULL;
total_ir_length += tap->ir_length) {
int total_ir_length = 0;
for (tap = jtag_tap_next_enabled(NULL); tap; tap = jtag_tap_next_enabled(tap)) {
if (tap->ir_length == 0)
total_ir_length += JTAG_IRLEN_MAX;
else
total_ir_length += tap->ir_length;
}
/* increase length to add 2 bit sentinel after scan */
@ -2008,7 +2008,7 @@ bool transport_is_jtag(void)
int adapter_resets(int trst, int srst)
{
if (get_current_transport() == NULL) {
if (!get_current_transport()) {
LOG_ERROR("transport is not selected");
return ERROR_FAIL;
}
@ -2065,7 +2065,7 @@ int adapter_assert_reset(void)
transport_is_dapdirect_jtag() || transport_is_dapdirect_swd() ||
transport_is_swim())
return adapter_system_reset(1);
else if (get_current_transport() != NULL)
else if (get_current_transport())
LOG_ERROR("reset is not supported on %s",
get_current_transport()->name);
else
@ -2082,7 +2082,7 @@ int adapter_deassert_reset(void)
transport_is_dapdirect_jtag() || transport_is_dapdirect_swd() ||
transport_is_swim())
return adapter_system_reset(0);
else if (get_current_transport() != NULL)
else if (get_current_transport())
LOG_ERROR("reset is not supported on %s",
get_current_transport()->name);
else

21
src/jtag/drivers/rlink.c
View File

@ -1148,11 +1148,8 @@ static int rlink_scan(struct jtag_command *cmd, enum scan_type type,
byte_bits -= chunk_bits;
if (type != SCAN_OUT) {
if (dtc_queue_enqueue_reply(
type, buffer, scan_size, tdi_bit_offset,
chunk_bits,
cmd
) == NULL) {
if (!dtc_queue_enqueue_reply(type, buffer, scan_size, tdi_bit_offset,
chunk_bits, cmd)) {
LOG_ERROR("enqueuing DTC reply entry: %s", strerror(errno));
exit(1);
}
@ -1208,11 +1205,8 @@ static int rlink_scan(struct jtag_command *cmd, enum scan_type type,
* and one reply byte */
dtc_queue_run_if_full(type == SCAN_IN ? 1 : 2, 1);
if (dtc_queue_enqueue_reply(
type, buffer, scan_size, tdi_bit_offset,
extra_bits,
cmd
) == NULL) {
if (!dtc_queue_enqueue_reply(type, buffer, scan_size, tdi_bit_offset,
extra_bits, cmd)) {
LOG_ERROR("enqueuing DTC reply entry: %s", strerror(errno));
exit(1);
}
@ -1260,11 +1254,8 @@ static int rlink_scan(struct jtag_command *cmd, enum scan_type type,
DTC_CMD_SHIFT_TMS_TDI_BIT_PAIR(1, (*tdi_p & tdi_mask), 0);
} else {
if (dtc_queue_enqueue_reply(
type, buffer, scan_size, tdi_bit_offset,
1,
cmd
) == NULL) {
if (!dtc_queue_enqueue_reply(type, buffer, scan_size, tdi_bit_offset,
1, cmd)) {
LOG_ERROR("enqueuing DTC reply entry: %s", strerror(errno));
exit(1);
}

2
src/jtag/drivers/vsllink.c
View File

@ -803,7 +803,7 @@ static int vsllink_check_usb_strings(
if (retval < 0)
return ERROR_FAIL;
if (strstr(desc_string, "Versaloon") == NULL)
if (!strstr(desc_string, "Versaloon"))
return ERROR_FAIL;
return ERROR_OK;

2
src/server/telnet_server.c
View File

@ -159,7 +159,7 @@ static void telnet_load_history(struct telnet_connection *t_con)
if (histfp) {
while (fgets(buffer, sizeof(buffer), histfp) != NULL) {
while (fgets(buffer, sizeof(buffer), histfp)) {
char *p = strchr(buffer, '\n');
if (p)

2
src/target/target.c
View File

@ -484,7 +484,7 @@ struct target *get_target(const char *id)
/* try as tcltarget name */
for (target = all_targets; target; target = target->next) {
if (target_name(target) == NULL)
if (!target_name(target))
continue;
if (strcmp(id, target_name(target)) == 0)
return target;

2
src/target/target_request.c
View File

@ -262,7 +262,7 @@ COMMAND_HANDLER(handle_target_request_debugmsgs_command)
}
/* see if receiver is already registered */
if (find_debug_msg_receiver(CMD_CTX, target) != NULL)
if (find_debug_msg_receiver(CMD_CTX, target))
receiving = 1;
if (CMD_ARGC > 0) {