aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sbus.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
committerBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
commit7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch)
treecc09f739029479eee683f26228e098db307fd1aa /epan/dissectors/packet-sbus.c
parentf8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff)
Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these). svn path=/trunk/; revision=46402
Diffstat (limited to 'epan/dissectors/packet-sbus.c')
-rw-r--r--epan/dissectors/packet-sbus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index 9c472fe1b3..4904574ae6 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -549,11 +549,11 @@ static GHashTable *sbus_request_hash = NULL;
static guint crc_calc (guint crc, guint val)
{
- int index;
+ int indx;
guint ncrc;
- index = (((crc >> 8) ^ val) & 0xff);
- ncrc = crc_table[index] ^ ((crc << 8) & 0xffff);
+ indx = (((crc >> 8) ^ val) & 0xff);
+ ncrc = crc_table[indx] ^ ((crc << 8) & 0xffff);
return ncrc;
}