From e4c53ec28c0653777a66446b3af893f5eca7d8a6 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 2 Jan 2019 17:00:22 -0800 Subject: Couchbase: Fixup a shadow variable. Rename index to byte_idx. Change-Id: I49d09d6db71d5db9e1c65f2abadc1413b3ccb7ec Reviewed-on: https://code.wireshark.org/review/31313 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-couchbase.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index fb6aaf9a8f..94cab3ead0 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -1648,16 +1648,16 @@ dissect_unsigned_leb128(tvbuff_t *tvb, gint start, gint end, guint32* value) { if ((byte & 0x80) == 0x80) { guint32 shift = 7; - gint index; - for (index = start+1; index < end; index++) { - byte = tvb_get_guint8(tvb, index); + gint byte_idx; + for (byte_idx = start+1; byte_idx < end; byte_idx++) { + byte = tvb_get_guint8(tvb, byte_idx); *value |= (byte & 0x7f) << shift; if ((byte & 0x80) == 0) { break; } shift += 7; } - return (index == end) ? -1 : index + 1; + return (byte_idx == end) ? -1 : byte_idx + 1; } return start + 1; } -- cgit v1.2.3