Make buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows...
authorAlexis La Goutte <alexis.lagoutte@gmail.com>
Fri, 7 Mar 2014 07:18:32 +0000 (08:18 +0100)
committerAlexis La Goutte <alexis.lagoutte@gmail.com>
Fri, 7 Mar 2014 07:20:47 +0000 (07:20 +0000)
Change-Id: I94e1da9f12c257fa4e2c597f29a200d35e2d5d0d
Reviewed-on: https://code.wireshark.org/review/546
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
epan/dissectors/packet-btle.c

index 7f61741d973a099834fedddd5f422940b40b8108..2a534e27f28e2dd9b7513282d028e9413ca0914a 100644 (file)
@@ -272,11 +272,11 @@ btle_crc(tvbuff_t *tvb, const guint8 payload_len, const guint32 crc_init)
     while( bytes_to_go-- ) {
         guint8 byte   = tvb_get_guint8(tvb, offset++);
         guint8 nibble = (byte & 0xf);
-        guint8 index  = ((state >> 16) & 0xf0) | nibble;
-        state  = ((state << 4) ^ btle_crc_next_state_flips[index]) & 0xffffff;
+        guint8 byte_index  = ((state >> 16) & 0xf0) | nibble;
+        state  = ((state << 4) ^ btle_crc_next_state_flips[byte_index]) & 0xffffff;
         nibble = ((byte >> 4) & 0xf);
-        index  = ((state >> 16) & 0xf0) | nibble;
-        state  = ((state << 4) ^ btle_crc_next_state_flips[index]) & 0xffffff;
+        byte_index  = ((state >> 16) & 0xf0) | nibble;
+        state  = ((state << 4) ^ btle_crc_next_state_flips[byte_index]) & 0xffffff;
     }
     return state;
 }