Fix unused and shadow variable errors.

svn path=/trunk/; revision=53200

3 files changed, 5 insertions, 5 deletions

diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index 4c50898763..758955f6c6 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -6741,7 +6741,7 @@ dissect_r3_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *r3_tree)
  *  Main dissector entry points
  */
 static int
-dissect_r3_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data_U_)
+dissect_r3_message (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
   proto_tree *r3_tree = NULL;
 
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index a62df58c50..08b9fc7cf4 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -340,12 +340,12 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da
                 {
                     proto_tree *checksum_tree;
                     guint8 sum = 0;
-                    const guint8 *data = tvb_get_ptr(tvb, 0, field_offset);
+                    const guint8 *sum_data = tvb_get_ptr(tvb, 0, field_offset);
                     gboolean sum_ok;
                     int j;
 
-                    for (j = 0; j < field_offset; j++, data++) {
-                         sum += *data;
+                    for (j = 0; j < field_offset; j++, sum_data++) {
+                         sum += *sum_data;
                     }
                     sum_ok = (atoi(value) == sum);
                     if (sum_ok) {
diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c
index 9bbe8d0406..700e06ba04 100644
--- a/epan/dissectors/packet-fmtp.c
+++ b/epan/dissectors/packet-fmtp.c
@@ -70,7 +70,7 @@ static const value_string system_message_names[] = {
 };
 
 static int
-dissect_fmtp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
+dissect_fmtp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     guint8      packet_type;
     guint16     packet_len;