From 4a47d87e4791a00cab4f420e23cd7d85aee0342b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Harboe?= Date: Mon, 13 Sep 2010 21:59:39 +0200 Subject: [PATCH] breakpoints: fix error handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit do not try to interpret "retval" into a string, just amend a bit about the context of the already reported error. Signed-off-by: Øyvind Harboe --- src/target/breakpoints.c | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index dc44642f75..917dfc7897 100644 --- a/src/target/breakpoints.c +++ b/src/target/breakpoints.c @@ -46,7 +46,6 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu { struct breakpoint *breakpoint = target->breakpoints; struct breakpoint **breakpoint_p = &target->breakpoints; - char *reason; int retval; int n; @@ -77,19 +76,9 @@ int breakpoint_add(struct target *target, uint32_t address, uint32_t length, enu (*breakpoint_p)->unique_id = bpwp_unique_id++; retval = target_add_breakpoint(target, *breakpoint_p); - switch (retval) { - case ERROR_OK: - break; - case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: - reason = "resource not available"; - goto fail; - case ERROR_TARGET_NOT_HALTED: - reason = "target running"; - goto fail; - default: - reason = "unknown reason"; -fail: - LOG_ERROR("can't add breakpoint: %s", reason); + if (retval != ERROR_OK) + { + LOG_ERROR("could not add breakpoint"); free((*breakpoint_p)->orig_instr); free(*breakpoint_p); *breakpoint_p = NULL; @@ -185,7 +174,6 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length, struct watchpoint *watchpoint = target->watchpoints; struct watchpoint **watchpoint_p = &target->watchpoints; int retval; - char *reason; while (watchpoint) { @@ -216,21 +204,11 @@ int watchpoint_add(struct target *target, uint32_t address, uint32_t length, (*watchpoint_p)->unique_id = bpwp_unique_id++; retval = target_add_watchpoint(target, *watchpoint_p); - switch (retval) { - case ERROR_OK: - break; - case ERROR_TARGET_RESOURCE_NOT_AVAILABLE: - reason = "resource not available"; - goto bye; - case ERROR_TARGET_NOT_HALTED: - reason = "target running"; - goto bye; - default: - reason = "unrecognized error"; -bye: - LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32 ", %s", + if (retval != ERROR_OK) + { + LOG_ERROR("can't add %s watchpoint at 0x%8.8" PRIx32, watchpoint_rw_strings[(*watchpoint_p)->rw], - address, reason); + address); free (*watchpoint_p); *watchpoint_p = NULL; return retval; -- 2.30.2