auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openocd: manually remove NULL comparisons

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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;