Eliminate duplicated code in the handle_mw_command memory write loop.

- wordsize will always be 1, 2, or 4 due to preceeding switch statement.
- move call to keep_alive after successful writes, not upon failures

git-svn-id: svn://svn.berlios.de/openocd/trunk@1953 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/target.c b/src/target/target.c
index 3921e8252620dab4ec443517ea8579fc60a2bfb0..95e7e5b7cacc9f58bb6897f941afc3a94e22fe38 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1958,27 +1958,11 @@ static int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char
        }
        for (i=0; i<count; i++)
        {
-               int retval;
-               switch (wordsize)
-               {
-                       case 4:
-                               retval = target->type->write_memory(target, address + i*wordsize, 4, 1, value_buf);
-                               break;
-                       case 2:
-                               retval = target->type->write_memory(target, address + i*wordsize, 2, 1, value_buf);
-                               break;
-                       case 1:
-                               retval = target->type->write_memory(target, address + i*wordsize, 1, 1, value_buf);
-                       break;
-                       default:
-                       return ERROR_OK;
-               }
-               keep_alive();
-
-               if (retval!=ERROR_OK)
-               {
+               int retval = target->type->write_memory(target,
+                               address + i * wordsize, wordsize, 1, value_buf);
+               if (ERROR_OK != retval)
                        return retval;
-               }
+               keep_alive();
        }
 
        return ERROR_OK;