Squelch compiler warnings

svn path=/trunk/; revision=19597

4 files changed, 14 insertions, 13 deletions

diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index c5ae1731d6..f8e7c0823a 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -87,6 +87,7 @@
 #include <epan/emem.h>
 #include <epan/addr_resolv.h>
 #include <epan/inet_aton.h>
+#include <isprint.h>
 #include "packet-dcerpc.h"
 #include "packet-dcom.h"
 #include "prefs.h"
@@ -946,7 +947,7 @@ dissect_dcom_tobedone_data(tvbuff_t *tvb, int offset,
 	item = proto_tree_add_bytes(tree, hf_dcom_tobedone, tvb, offset, length, 
 		tvb_get_ptr(tvb, offset, length));
         PROTO_ITEM_SET_GENERATED(item);
-	expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "Dissection incomplete", length);
+	expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "Dissection incomplete");
 
 	offset += length;
 
@@ -966,7 +967,7 @@ dissect_dcom_nospec_data(tvbuff_t *tvb, int offset,
 	item = proto_tree_add_bytes(tree, hf_dcom_nospec, tvb, offset, length, 
 		tvb_get_ptr(tvb, offset, length));
         PROTO_ITEM_SET_GENERATED(item);
-	expert_add_info_format(pinfo, item, PI_UNDECODED, PI_NOTE, "No specification available, dissection not possible", length);
+	expert_add_info_format(pinfo, item, PI_UNDECODED, PI_NOTE, "No specification available, dissection not possible");
 
 	offset += length;
 
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 761ccee16a..d47b62a27d 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -486,12 +486,12 @@ proto_register_eth(void)
 
                 { &hf_eth_ig,
 		{ "IG bit", "eth.ig", FT_BOOLEAN, 24,
-		  VALS(&ig_tfs), 0x010000,
+		  TFS(&ig_tfs), 0x010000,
 		  "Specifies if this is an individual (unicast) or group (broadcast/multicast) address", HFILL }},
 
                 { &hf_eth_lg,
 		{ "LG bit", "eth.lg", FT_BOOLEAN, 24,
-		  VALS(&lg_tfs), 0x020000,
+		  TFS(&lg_tfs), 0x020000,
 		  "Specifies if this is a locally administered or globally unique (IEEE assigned) address", HFILL }},
 
 	};
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index e5183a8b66..0bee9271e2 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -1672,13 +1672,13 @@ void proto_register_isns(void)
 
 	{ &hf_isns_resp_errorcode,
 	  { "ErrorCode","isns.errorcode",
-	    FT_UINT32, BASE_DEC,TFS(isns_errorcode),0,
+	    FT_UINT32, BASE_DEC,VALS(isns_errorcode),0,
 	    "iSNS Response Error Code" ,HFILL}
 	},
 
 	{ &hf_isns_attr_tag,
 	  { "Attribute Tag","isns.attr.tag",
-	    FT_UINT32, BASE_DEC,TFS(isns_attribute_tags),0,
+	    FT_UINT32, BASE_DEC,VALS(isns_attribute_tags),0,
 	    "iSNS Attribute Tag" ,HFILL}
 	},
 
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 75d4a2d07c..83d70fb7e7 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -4871,25 +4871,25 @@ proto_register_kerberos(void)
 	    NULL, 0, "GSSAPI Bnd field", HFILL }},
 	{ &hf_krb_gssapi_c_flag_deleg, {
 	    "Deleg", "kerberos.gssapi.checksum.flags.deleg", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_deleg), KRB5_GSS_C_DELEG_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_deleg), KRB5_GSS_C_DELEG_FLAG, "", HFILL }},
 	{ &hf_krb_gssapi_c_flag_mutual, {
 	    "Mutual", "kerberos.gssapi.checksum.flags.mutual", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_mutual), KRB5_GSS_C_MUTUAL_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_mutual), KRB5_GSS_C_MUTUAL_FLAG, "", HFILL }},
 	{ &hf_krb_gssapi_c_flag_replay, {
 	    "Replay", "kerberos.gssapi.checksum.flags.replay", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_replay), KRB5_GSS_C_REPLAY_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_replay), KRB5_GSS_C_REPLAY_FLAG, "", HFILL }},
 	{ &hf_krb_gssapi_c_flag_sequence, {
 	    "Sequence", "kerberos.gssapi.checksum.flags.sequence", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_sequence), KRB5_GSS_C_SEQUENCE_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_sequence), KRB5_GSS_C_SEQUENCE_FLAG, "", HFILL }},
 	{ &hf_krb_gssapi_c_flag_conf, {
 	    "Conf", "kerberos.gssapi.checksum.flags.conf", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_conf), KRB5_GSS_C_CONF_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_conf), KRB5_GSS_C_CONF_FLAG, "", HFILL }},
 	{ &hf_krb_gssapi_c_flag_integ, {
 	    "Integ", "kerberos.gssapi.checksum.flags.integ", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_integ), KRB5_GSS_C_INTEG_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_integ), KRB5_GSS_C_INTEG_FLAG, "", HFILL }},
 	{ &hf_krb_gssapi_c_flag_dce_style, {
 	    "DCE-style", "kerberos.gssapi.checksum.flags.dce-style", FT_BOOLEAN, 32,
-	    VALS(&tfs_gss_flags_dce_style), KRB5_GSS_C_DCE_STYLE, "", HFILL }},
+	    TFS(&tfs_gss_flags_dce_style), KRB5_GSS_C_DCE_STYLE, "", HFILL }},
 	{ &hf_krb_gssapi_dlgopt, {
 	    "DlgOpt", "kerberos.gssapi.dlgopt", FT_UINT16, BASE_DEC,
 	    NULL, 0, "GSSAPI DlgOpt", HFILL }},