gdbserver: fix gdb_port memory leak

[openocd] / src / jtag / drivers / jlink.c

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 21dfab2277ec24be3a543774e31236acd111c109..52f12b4378a12071354b7cc530494c72b269780d 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -202,7 +202,7 @@ static void jlink_execute_command(struct jtag_command *cmd)
        switch (cmd->type)
        {
        case JTAG_RUNTEST:   jlink_execute_runtest(cmd); break;
-       case JTAG_STATEMOVE: jlink_execute_statemove(cmd); break;
+       case JTAG_TLR_RESET: jlink_execute_statemove(cmd); break;
        case JTAG_PATHMOVE:  jlink_execute_pathmove(cmd); break;
        case JTAG_SCAN:      jlink_execute_scan(cmd); break;
        case JTAG_RESET:     jlink_execute_reset(cmd); break;
@@ -712,9 +712,9 @@ static void jlink_tap_ensure_space(int scans, int bits)
 
 static void jlink_tap_append_step(int tms, int tdi)
 {
-       int index = tap_length / 8;
+       int index_var = tap_length / 8;
 
-       if (index >= JLINK_TAP_BUFFER_SIZE)
+       if (index_var >= JLINK_TAP_BUFFER_SIZE)
        {
                LOG_ERROR("jlink_tap_append_step: overflow");
                *(uint32_t *)0xFFFFFFFF = 0;
@@ -727,18 +727,18 @@ static void jlink_tap_append_step(int tms, int tdi)
        // we do not pad TMS, so be sure to initialize all bits
        if (0 == bit_index)
        {
-               tms_buffer[index] = tdi_buffer[index] = 0;
+               tms_buffer[index_var] = tdi_buffer[index_var] = 0;
        }
 
        if (tms)
-               tms_buffer[index] |= bit;
+               tms_buffer[index_var] |= bit;
        else
-               tms_buffer[index] &= ~bit;
+               tms_buffer[index_var] &= ~bit;
 
        if (tdi)
-               tdi_buffer[index] |= bit;
+               tdi_buffer[index_var] |= bit;
        else
-               tdi_buffer[index] &= ~bit;
+               tdi_buffer[index_var] &= ~bit;
 
        tap_length++;
 }