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>

8 files changed, 14 insertions, 14 deletions

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 97bd7a3..6ce0575 100644
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -139,9 +139,9 @@ static int lpc3180_init(struct nand_device *nand)
 {
 	struct lpc3180_nand_controller *lpc3180_info = nand->controller_priv;
 	struct target *target = nand->target;
-	int bus_width = nand->bus_width ? : 8;
-	int address_cycles = nand->address_cycles ? : 3;
-	int page_size = nand->page_size ? : 512;
+	int bus_width = nand->bus_width ? nand->bus_width : 8;
+	int address_cycles = nand->address_cycles ? nand->address_cycles : 3;
+	int page_size = nand->page_size ? nand->page_size : 512;
 
 	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("target must be halted to use LPC3180 NAND flash controller");
diff --git a/src/flash/nand/lpc32xx.c b/src/flash/nand/lpc32xx.c
index 6443beb..f117ead 100644
--- a/src/flash/nand/lpc32xx.c
+++ b/src/flash/nand/lpc32xx.c
@@ -191,9 +191,9 @@ static int lpc32xx_init(struct nand_device *nand)
 {
 	struct lpc32xx_nand_controller *lpc32xx_info = nand->controller_priv;
 	struct target *target = nand->target;
-	int bus_width = nand->bus_width ? : 8;
-	int address_cycles = nand->address_cycles ? : 3;
-	int page_size = nand->page_size ? : 512;
+	int bus_width = nand->bus_width ? nand->bus_width : 8;
+	int address_cycles = nand->address_cycles ? nand->address_cycles : 3;
+	int page_size = nand->page_size ? nand->page_size : 512;
 	int retval;
 
 	if (target->state != TARGET_HALTED) {
diff --git a/src/flash/nand/nuc910.c b/src/flash/nand/nuc910.c
index 1a2dd59..9546f2f 100644
--- a/src/flash/nand/nuc910.c
+++ b/src/flash/nand/nuc910.c
@@ -183,7 +183,7 @@ static int nuc910_nand_init(struct nand_device *nand)
 {
 	struct nuc910_nand_controller *nuc910_nand = nand->controller_priv;
 	struct target *target = nand->target;
-	int bus_width = nand->bus_width ? : 8;
+	int bus_width = nand->bus_width ? nand->bus_width : 8;
 	int result;
 
 	result = validate_target_state(nand);
diff --git a/src/helper/command.c b/src/helper/command.c
index 43c5a0f..4be3abd 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -866,9 +866,9 @@ static COMMAND_HELPER(command_help_show, struct help_entry *c,
 					stage_msg = " (?mode error?)";
 					break;
 			}
-			msg = alloc_printf("%s%s", c->help ? : "", stage_msg);
+			msg = alloc_printf("%s%s", c->help ? c->help : "", stage_msg);
 		} else
-			msg = alloc_printf("%s", c->help ? : "");
+			msg = alloc_printf("%s", c->help ? c->help : "");
 
 		if (NULL != msg) {
 			command_help_show_wrap(msg, n + 3, n + 3);
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;
diff --git a/src/target/target.c b/src/target/target.c
index 63f68eb..450e231 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5178,7 +5178,7 @@ no_params:
 				if (goi->argc != 0)
 					goto no_params;
 			}
-			Jim_SetResultString(goi->interp, target->gdb_port_override ? : "undefined", -1);
+			Jim_SetResultString(goi->interp, target->gdb_port_override ? target->gdb_port_override : "undefined", -1);
 			/* loop for more */
 			break;