Fix numerous instances of a variable/parameter name "shadowing" a library function...

[metze/wireshark/wip.git] / epan / dissectors / packet-sbus.c

diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index 593fbbfffb0ac735f127dd89d92bc4f593222c91..4904574ae6b5160c01f28bf16dac3eef1868b1b1 100644 (file)
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include <epan/packet.h>
@@ -551,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;
 }
@@ -635,7 +633,7 @@ is_sbus_pdu(tvbuff_t *tvb)
 
 /*Dissect the telegram*/
 static int
-dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
 
 /* Set up structures needed to add the protocol subtree and manage it */