diff options
| author | R. Diez <rdiezmail-openocd@yahoo.de> | 2021-05-23 12:01:48 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-06-04 17:46:24 +0100 |
| commit | 6a49b1ce2344c8707e322565ff0e5254762353fd (patch) | |
| tree | dde61d5542e138d718c0d0ac04ed709c81f25c74 /src/jtag | |
| parent | 358ab3483d2cad0c869585f8a340154690f56569 (diff) | |
| download | riscv-openocd-6a49b1ce2344c8707e322565ff0e5254762353fd.zip riscv-openocd-6a49b1ce2344c8707e322565ff0e5254762353fd.tar.gz riscv-openocd-6a49b1ce2344c8707e322565ff0e5254762353fd.tar.bz2 | |
Avoid non-standard conditionals with omitted operands.
Fixes bug #257.
Change-Id: I05fc6468306d46399e769098e031e7e588798afc
Signed-off-by: R. Diez <rdiezmail-openocd@yahoo.de>
Reviewed-on: http://openocd.zylin.com/6271
Tested-by: jenkins
Reviewed-by: Xiang W <wxjstz@126.com>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/adapter.c | 2 | ||||
| -rw-r--r-- | src/jtag/core.c | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/stlink_usb.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index 03bb1a9..a867d2c 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -62,7 +62,7 @@ static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv) return JIM_ERR; } const char *name = adapter_driver ? adapter_driver->name : NULL; - Jim_SetResultString(goi.interp, name ? : "undefined", -1); + Jim_SetResultString(goi.interp, name ? name : "undefined", -1); return JIM_OK; } diff --git a/src/jtag/core.c b/src/jtag/core.c index 2166374..456faf7 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1455,7 +1455,7 @@ void jtag_tap_init(struct jtag_tap *tap) unsigned ir_len_bytes; /* if we're autoprobing, cope with potentially huge ir_length */ - ir_len_bits = tap->ir_length ? : JTAG_IRLEN_MAX; + ir_len_bits = tap->ir_length ? tap->ir_length : JTAG_IRLEN_MAX; ir_len_bytes = DIV_ROUND_UP(ir_len_bits, 8); tap->expected = calloc(1, ir_len_bytes); diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index 7e3280b..c68bbb3 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -3904,7 +3904,7 @@ static int stlink_dap_op_queue_dp_read(struct adiv5_dap *dap, unsigned reg, if (retval != ERROR_OK) return retval; - data = data ? : &dummy; + data = data ? data : &dummy; if (stlink_dap_handle->version.flags & STLINK_F_QUIRK_JTAG_DP_READ && stlink_dap_handle->st_mode == STLINK_MODE_DEBUG_JTAG) { /* Quirk required in JTAG. Read RDBUFF to get the data */ @@ -3969,7 +3969,7 @@ static int stlink_dap_op_queue_ap_read(struct adiv5_ap *ap, unsigned reg, if (retval != ERROR_OK) return retval; } - data = data ? : &dummy; + data = data ? data : &dummy; retval = stlink_read_dap_register(stlink_dap_handle, ap->ap_num, reg, data); dap->stlink_flush_ap_write = false; |