Continuing the tradition: squelch some compiler warnings ....

svn path=/trunk/; revision=20866

10 files changed, 12 insertions, 13 deletions

diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 664069aac5..784dee4442 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -201,7 +201,7 @@ dissect_amr_if2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
  *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
 static void
-dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
+dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree){
 	proto_item *item;
 	guint8 octet;
 	int offset =0;
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 92c14d56b3..41dca13361 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -231,7 +231,7 @@ register_ber_oid_name(const char *oid, const char *name)
 	add_oid_str_name(oid, name);
 }
 
-static void ber_decode_as_dt(gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data)
+static void ber_decode_as_dt(gchar *table_name _U_, ftenum_t selector_type _U_, gpointer key, gpointer value, gpointer user_data)
 {
   da_data *decode_as_data;
   
@@ -566,7 +566,6 @@ int
 call_ber_syntax_callback(const char *syntax, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
 	tvbuff_t *next_tvb;
-	const char *fsyntax = NULL;
 
 	next_tvb = tvb_new_subset(tvb, offset, -1, -1);
 	if(syntax == NULL ||
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 8e82aedabe..d24af97797 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -3995,7 +3995,7 @@ decode_iei_rrlp_flags(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
 }
 
 static void /* [7] 11.3.61 RIM Application Identity */
-decode_iei_rim_application_identity(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
+decode_iei_rim_application_identity(bssgp_ie_t *ie _U_, build_info_t *bi, int ie_start_offset _U_) {
   proto_item *ti;
   guint8 appid;
 
@@ -4243,7 +4243,7 @@ static const value_string ran_inf_pdu_type_ext_vals[] = {
 /* 11.3.65 RIM PDU Indications 3GPP TS 48.018 version 6.7.0 Release 6 */
 static void 
 decode_iei_rim_pdu_indications(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
-  const guint8 MASK_EXT = 0x0E;
+  /**  const guint8 MASK_EXT = 0x0E; **/
   const guint8 MASK_ACK = 0x01;
   proto_item *ti, *pi;
   proto_tree *tf;
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index 2eb35aa779..5544c48a99 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -265,7 +265,7 @@ void dcom_interface_dump(void) {
 }
 
 
-dcom_interface_t *dcom_interface_find(packet_info *pinfo, const guint8 *ip, e_uuid_t *ipid) 
+dcom_interface_t *dcom_interface_find(packet_info *pinfo _U_, const guint8 *ip _U_, e_uuid_t *ipid) 
 {
     dcom_interface_t *interf;
     GList *interfaces;
diff --git a/epan/dissectors/packet-dis-fields.c b/epan/dissectors/packet-dis-fields.c
index 5814f2e636..c62f789be4 100644
--- a/epan/dissectors/packet-dis-fields.c
+++ b/epan/dissectors/packet-dis-fields.c
@@ -363,7 +363,7 @@ gint parseField_Int(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode
  * padding, which occurs whenever padding is inserted to properly align the
  * field.
  */
-gint parseField_Pad(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode parserNode, guint numBytes)
+gint parseField_Pad(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode parserNode _U_, guint numBytes)
 {
     proto_tree_add_text(tree, tvb, offset, numBytes,
         "Explicit Padding (%d bytes)", numBytes);
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 2307291ff8..2f7adf7942 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -2368,7 +2368,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 static guint
-get_dnp3_message_len(packet_info *pinfo, tvbuff_t *tvb, int offset)
+get_dnp3_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 {
   guint16 message_len;  /* need 16 bits as total can exceed 255 */
   guint16 data_crc;     /* No. of user data CRC bytes */
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 038a5440e1..e12e2ab708 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -491,7 +491,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
 }
 
 static void
-dissect_fcp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, conversation_t *conversation, fc_hdr *fchdr, itl_nexus_t *itl)
+dissect_fcp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, conversation_t *conversation _U_, fc_hdr *fchdr, itl_nexus_t *itl)
 {
     dissect_scsi_payload(tvb, pinfo, parent_tree, FALSE, fchdr->itlq, itl, fchdr->relative_offset);
 }
@@ -512,7 +512,7 @@ dissect_fcp_rspinfo(tvbuff_t *tvb, proto_tree *tree, int offset)
 }
 
 static void
-dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree *tree, conversation_t *conversation, fc_hdr *fchdr, itl_nexus_t *itl)
+dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree *tree, conversation_t *conversation _U_, fc_hdr *fchdr, itl_nexus_t *itl)
 {
     guint32 offset = 0;
     gint32 snslen = 0,
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index ec44eee233..45516fcbc4 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -2520,7 +2520,7 @@ static const value_string GetChannelAuthCap_max_priv_lev_vals[] = {
 /* 22-15, Get Channel Authentication Capabilities Command */
 static void
 dissect_cmd_Get_Channel_Auth_Capabilities(proto_tree *tree, proto_tree *ipmi_tree, packet_info *pinfo _U_, tvbuff_t *tvb,
-								gint *poffset, guint8 len, guint8 response, guint8 auth_offset)
+								gint *poffset, guint8 len _U_, guint8 response, guint8 auth_offset _U_)
 {
 	proto_tree	*field_tree = NULL;
 	proto_item	*tf = NULL;
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index b308f8e85c..f9160177d0 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -181,7 +181,7 @@ static const value_string mp2t_afc_vals[] = {
 };
 
 static gint
-dissect_tsp( tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree ) 
+dissect_tsp( tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree ) 
 {
 	guint32 header;
 	guint afc;
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 5d98028070..61252243df 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -561,7 +561,7 @@ dissect_osd_attribute_data_out(packet_info *pinfo, tvbuff_t *tvb, int offset _U_
 
 
 static void
-dissect_osd_attribute_data_in(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree, scsi_task_data_t *cdata)
+dissect_osd_attribute_data_in(packet_info *pinfo, tvbuff_t *tvb, int offset _U_, proto_tree *tree, scsi_task_data_t *cdata)
 {
 	guint8 gsatype=0;
 	scsi_osd_extra_data_t *extra_data=NULL;