Factoring of jtag_examine_chain for maintainability:

- Limit scope: move tap and bit_count variables to point of first use.

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

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index d94bebe13e9670af1cd146b1a634546377d79670..96565d949e97c8761a5ae4ee029de20dce614731 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -1064,9 +1064,7 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap)
  */
 static int jtag_examine_chain(void)
 {
-       jtag_tap_t *tap;
        u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4];
-       int bit_count;
        int device_count = 0;
 
        jtag_examine_chain_execute(idcode_buffer, JTAG_MAX_CHAIN_SIZE);
@@ -1075,14 +1073,14 @@ static int jtag_examine_chain(void)
                return ERROR_JTAG_INIT_FAILED;
 
        /* point at the 1st tap */
-       tap = jtag_tap_next_enabled(NULL);
+       jtag_tap_t *tap = jtag_tap_next_enabled(NULL);
        if (tap == NULL)
        {
                LOG_ERROR("JTAG: No taps enabled?");
                return ERROR_JTAG_INIT_FAILED;
        }
 
-       for (bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;)
+       for (unsigned bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;)
        {
                u32 idcode = buf_get_u32(idcode_buffer, bit_count, 32);
                if ((idcode & 1) == 0)