[Openocd-svn] r2191 - trunk/src/target

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-11 13:42:33 +0200 (Thu, 11 Jun 2009)
New Revision: 2191

Modified:
   trunk/src/target/target.c
Log:
Simplify handle_resume_command:
- Eliminate redundant calls to target_resume with addr temp variable.
- Place variables at location of first use.
- Fix minor whitespace issues.


Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-06-11 11:42:26 UTC (rev 2190)
+++ trunk/src/target/target.c	2009-06-11 11:42:33 UTC (rev 2191)
@@ -1931,21 +1931,20 @@
 
 static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	int retval;
+	if (argc > 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	target_t *target = get_current_target(cmd_ctx);
+	target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
 
-	target_handle_event( target, TARGET_EVENT_OLD_pre_resume );
+	/* with no args, resume from current pc, addr = 0,
+	 * with one arguments, addr = args[0],
+	 * handle breakpoints, not debugging */
+	u32 addr = 0;
+	if (argc == 1)
+		addr = strtoul(args[0], NULL, 0);
 
-	if (argc == 0)
-		retval = target_resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */
-	else if (argc == 1)
-		retval = target_resume(target, 0, strtoul(args[0], NULL, 0), 1, 0); /* addr = args[0], handle breakpoints, not debugging */
-	else
-	{
-		retval = ERROR_COMMAND_SYNTAX_ERROR;
-	}
-
-	return retval;
+	return target_resume(target, 0, addr, 1, 0);
 }
 
 static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)