From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Wed, 11 Aug 2010 09:00:02 +0000 (+0200)
Subject: debug: use assert's when approperiate
X-Git-Tag: v0.5.0-rc1~460
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=676f48d77db83c687740955aed6783ea6d326853;p=openocd

debug: use assert's when approperiate

error was returned instead of using assert.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 37c228f8..f5812781 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -45,8 +45,7 @@ static inline int arm_jtag_set_instr(struct arm_jtag *jtag_info,
 	/* inline most common code path */
 	struct jtag_tap *tap;
 	tap = jtag_info->tap;
-	if (tap == NULL)
-		return ERROR_FAIL;
+	assert (tap != NULL);
 
 	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
 	{
diff --git a/src/target/xscale.c b/src/target/xscale.c
index c0080b2b..44358bc3 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -160,8 +160,7 @@ static int xscale_verify_pointer(struct command_context *cmd_ctx,
 
 static int xscale_jtag_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state)
 {
-	if (tap == NULL)
-		return ERROR_FAIL;
+	assert (tap != NULL);
 
 	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
 	{