From 2ad1c8df66d56aca378518a6e2bf8a40d46ccd7f Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Fri, 6 May 2011 12:28:11 +0000 Subject: [PATCH] VALS(& -> VALS( svn path=/trunk/; revision=37009 --- epan/dissectors/packet-bacapp.c | 6 +++--- epan/dissectors/packet-coap.c | 6 +++--- epan/dissectors/packet-gre.c | 2 +- epan/dissectors/packet-gtpv2.c | 10 +++++----- epan/dissectors/packet-ieee80211.c | 32 +++++++++++++++--------------- epan/dissectors/packet-isakmp.c | 8 ++++---- epan/dissectors/packet-mip6.c | 6 +++--- epan/dissectors/packet-synphasor.c | 4 ++-- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 67b36808d0..95e0ab36c0 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -9501,7 +9501,7 @@ proto_register_bacapp(void) { &hf_BACnetApplicationTagNumber, { "Application Tag Number", "bacapp.application_tag_number", - FT_UINT8, BASE_DEC, VALS(&BACnetApplicationTagNumber), 0xF0, + FT_UINT8, BASE_DEC, VALS(BACnetApplicationTagNumber), 0xF0, NULL, HFILL } }, { &hf_BACnetContextTagNumber, @@ -9519,13 +9519,13 @@ proto_register_bacapp(void) { &hf_BACnetNamedTag, { "Named Tag", "bacapp.named_tag", - FT_UINT8, BASE_DEC, VALS(&BACnetTagNames), 0x07, + FT_UINT8, BASE_DEC, VALS(BACnetTagNames), 0x07, NULL, HFILL } }, { &hf_BACnetCharacterSet, { "String Character Set", "bacapp.string_character_set", - FT_UINT8, BASE_DEC, VALS(&BACnetCharacterSet),0, + FT_UINT8, BASE_DEC, VALS(BACnetCharacterSet),0, NULL, HFILL } }, { &hf_BACnetTagClass, diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 6ceb229e1f..51a18698c1 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -455,13 +455,13 @@ proto_register_coap(void) { static hf_register_info hf[] = { { &hf_coap_version, { "Version", "coap.version", FT_UINT8, BASE_DEC, NULL, 0xc0, "COAP Version", HFILL }}, - { &hf_coap_ttype, { "Type", "coap.type", FT_UINT8, BASE_DEC, VALS(&vals_ttype), 0x30, "COAP Transaction Type", HFILL }}, + { &hf_coap_ttype, { "Type", "coap.type", FT_UINT8, BASE_DEC, VALS(vals_ttype), 0x30, "COAP Transaction Type", HFILL }}, { &hf_coap_opt_count, { "Option Count", "coap.optcount", FT_UINT8, BASE_DEC, NULL, 0x0f, "COAP Option Count", HFILL }}, - { &hf_coap_code, { "Code", "coap.code", FT_UINT8, BASE_DEC, VALS(&vals_code), 0x0, "COAP Method or Response Code", HFILL }}, + { &hf_coap_code, { "Code", "coap.code", FT_UINT8, BASE_DEC, VALS(vals_code), 0x0, "COAP Method or Response Code", HFILL }}, { &hf_coap_tid, { "Transaction ID", "coap.tid", FT_UINT16, BASE_DEC, NULL, 0x0, "COAP Transaction ID", HFILL }}, { &hf_coap_opt_delta, { "Delta", "coap.opt.delta", FT_UINT8, BASE_DEC, NULL, 0xf0, "COAP Option Delta", HFILL }}, { &hf_coap_opt_length, { "Length", "coap.opt.length", FT_UINT16, BASE_DEC, NULL, 0x0, "COAP Option Length", HFILL }}, - { &hf_coap_opt_ctype, { "Content-type", "coap.opt.ctype", FT_UINT8, BASE_DEC, VALS(&vals_ctype), 0x0, "COAP Content Type", HFILL }}, + { &hf_coap_opt_ctype, { "Content-type", "coap.opt.ctype", FT_UINT8, BASE_DEC, VALS(vals_ctype), 0x0, "COAP Content Type", HFILL }}, { &hf_coap_opt_max_age, { "Max-age", "coap.opt.max_age", FT_INT32, BASE_DEC, NULL, 0x0, "COAP Max-age", HFILL }}, { &hf_coap_opt_etag, { "Etag", "coap.opt.etag", FT_BYTES, BASE_NONE, NULL, 0x0, "COAP Etag", HFILL }}, { &hf_coap_opt_uri_authority, { "Uri-Authority", "coap.opt.uri_auth", FT_STRING, BASE_NONE, NULL, 0x0, "COAP Uri-Authority", HFILL }}, diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 819f3a29e1..0552c6029b 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -642,7 +642,7 @@ proto_register_gre(void) NULL, HFILL }}, { &hf_gre_wccp_service_id, { "Service ID", "gre.wccp.service_id", - FT_UINT8, BASE_DEC, VALS(&service_id_vals), 0x00, + FT_UINT8, BASE_DEC, VALS(service_id_vals), 0x00, "Service Group identifier", HFILL }}, { &hf_gre_wccp_alternative_bucket, { "Alternative Bucket", "gre.wccp.alternative_bucket", diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index bae5c67ad6..e5ecd2d12c 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -4365,22 +4365,22 @@ void proto_register_gtpv2(void) }, { &hf_gtpv2_CauseRadioNetwork, {"Radio Network Layer Cause","gtpv2.CauseRadioNetwork", - FT_UINT8, BASE_DEC, VALS(&s1ap_CauseRadioNetwork_vals),0x0, + FT_UINT8, BASE_DEC, VALS(s1ap_CauseRadioNetwork_vals),0x0, NULL, HFILL} }, { &hf_gtpv2_CauseTransport, {"Transport Layer Cause","gtpv2.CauseTransport", - FT_UINT8, BASE_DEC, VALS(&s1ap_CauseTransport_vals),0x0, + FT_UINT8, BASE_DEC, VALS(s1ap_CauseTransport_vals),0x0, NULL, HFILL} }, { &hf_gtpv2_CauseNas, {"NAS Cause","gtpv2.CauseNas", - FT_UINT8, BASE_DEC, VALS(&s1ap_CauseNas_vals),0x0, + FT_UINT8, BASE_DEC, VALS(s1ap_CauseNas_vals),0x0, NULL, HFILL} }, { &hf_gtpv2_CauseMisc, {"Miscellaneous Cause","gtpv2.CauseMisc", - FT_UINT8, BASE_DEC, VALS(&s1ap_CauseMisc_vals),0x0, + FT_UINT8, BASE_DEC, VALS(s1ap_CauseMisc_vals),0x0, NULL, HFILL} }, { &hf_gtpv2_target_type, @@ -4395,7 +4395,7 @@ void proto_register_gtpv2(void) }, { &hf_gtpv2_CauseProtocol, {"Protocol Cause","gtpv2.CauseProtocol", - FT_UINT8, BASE_DEC, VALS(&s1ap_CauseProtocol_vals),0x0, + FT_UINT8, BASE_DEC, VALS(s1ap_CauseProtocol_vals),0x0, NULL, HFILL} }, {&hf_gtpv2_apn_rest, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index c694b83e56..43225c8a92 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -11720,7 +11720,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_tdls_action_code, {"Action code", "wlan_mgt.fixed.action_code", - FT_UINT8, BASE_DEC, VALS(&tdls_action_codes), 0, + FT_UINT8, BASE_DEC, VALS(tdls_action_codes), 0, "Management action code", HFILL }}, {&hf_ieee80211_ff_target_channel, @@ -11781,11 +11781,11 @@ proto_register_ieee80211 (void) NULL, HFILL }}, { &hf_ieee80211_prism_did_type, - {"DID", "prism.did.type", FT_UINT32, BASE_HEX, VALS(&prism_did_vals), 0x0, + {"DID", "prism.did.type", FT_UINT32, BASE_HEX, VALS(prism_did_vals), 0x0, "Different ID for each parameter", HFILL }}, { &hf_ieee80211_prism_did_status, - {"Status", "prism.did.status", FT_UINT16, BASE_DEC, VALS(&prism_status_vals), 0x0, + {"Status", "prism.did.status", FT_UINT16, BASE_DEC, VALS(prism_status_vals), 0x0, "Supplied by the driver or not", HFILL }}, { &hf_ieee80211_prism_did_length, @@ -11825,7 +11825,7 @@ proto_register_ieee80211 (void) "In Mb/s", HFILL }}, { &hf_ieee80211_prism_did_istx, - {"IsTX", "prism.did.istx", FT_UINT32, BASE_HEX, VALS(&prism_istx_vals), 0x0, + {"IsTX", "prism.did.istx", FT_UINT32, BASE_HEX, VALS(prism_istx_vals), 0x0, "Type of packet (RX or TX ?)", HFILL }}, { &hf_ieee80211_prism_did_frmlen, @@ -12492,11 +12492,11 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_mimo_cntrl_nc_index, {"Nc Index", "wlan_mgt.fixed.mimo.control.ncindex", - FT_UINT16, BASE_HEX, VALS(&ff_mimo_cntrl_nc_index_flags), 0x0003, "Number of Columns Less One", HFILL }}, + FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_nc_index_flags), 0x0003, "Number of Columns Less One", HFILL }}, {&hf_ieee80211_ff_mimo_cntrl_nr_index, {"Nr Index", "wlan_mgt.fixed.mimo.control.nrindex", - FT_UINT16, BASE_HEX, VALS(&ff_mimo_cntrl_nr_index_flags), 0x000C, "Number of Rows Less One", HFILL }}, + FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_nr_index_flags), 0x000C, "Number of Rows Less One", HFILL }}, {&hf_ieee80211_ff_mimo_cntrl_channel_width, {"Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth", @@ -12504,15 +12504,15 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_mimo_cntrl_grouping, {"Grouping (Ng)", "wlan_mgt.fixed.mimo.control.grouping", - FT_UINT16, BASE_HEX, VALS(&ff_mimo_cntrl_grouping_flags), 0x0060, NULL, HFILL }}, + FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_grouping_flags), 0x0060, NULL, HFILL }}, {&hf_ieee80211_ff_mimo_cntrl_coefficient_size, {"Coefficient Size (Nb)", "wlan_mgt.fixed.mimo.control.cosize", - FT_UINT16, BASE_HEX, VALS(&ff_mimo_cntrl_coefficient_size_flags), 0x0180, NULL, HFILL }}, + FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_coefficient_size_flags), 0x0180, NULL, HFILL }}, {&hf_ieee80211_ff_mimo_cntrl_codebook_info, {"Codebook Information", "wlan_mgt.fixed.mimo.control.codebookinfo", - FT_UINT16, BASE_HEX, VALS(&ff_mimo_cntrl_codebook_info_flags), 0x0600, NULL, HFILL }}, + FT_UINT16, BASE_HEX, VALS(ff_mimo_cntrl_codebook_info_flags), 0x0600, NULL, HFILL }}, {&hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment, {"Remaining Matrix Segment", "wlan_mgt.fixed.mimo.control.matrixseg", @@ -12532,7 +12532,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_psmp_sta_info_type, {"Sta Info Type", "wlan_mgt.fixed.psmp.stainfo.type", - FT_UINT32, BASE_HEX, VALS(&ff_psmp_sta_info_flags), PSMP_STA_INFO_FLAG_TYPE, NULL, HFILL }}, + FT_UINT32, BASE_HEX, VALS(ff_psmp_sta_info_flags), PSMP_STA_INFO_FLAG_TYPE, NULL, HFILL }}, {&hf_ieee80211_ff_psmp_sta_info_dtt_start_offset, {"DTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.dttstart", @@ -12608,7 +12608,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode, {"Channel Switch Mode", "wlan_mgt.fixed.extchansw.switchmode", - FT_UINT32, BASE_HEX, VALS(&ieee80211_tag_ext_channel_switch_announcement_switch_mode_flags), 0x000000FF, NULL, HFILL }}, + FT_UINT32, BASE_HEX, VALS(ieee80211_tag_ext_channel_switch_announcement_switch_mode_flags), 0x000000FF, NULL, HFILL }}, {&hf_ieee80211_ff_ext_channel_switch_announcement_new_reg_class, {"New Regulatory Class", "wlan_mgt.fixed.extchansw.new.regclass", @@ -12940,7 +12940,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_ft_action_code, {"Action code", "wlan_mgt.fixed.action_code", - FT_UINT8, BASE_DEC, VALS(&ft_action_codes), 0, + FT_UINT8, BASE_DEC, VALS(ft_action_codes), 0, "Management action code", HFILL }}, {&hf_ieee80211_ff_sta_address, @@ -12982,7 +12982,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_anqp_info_id, {"Info ID", "wlan_mgt.fixed.anqp.info_id", - FT_UINT16, BASE_DEC, VALS(&anqp_info_id_vals), 0, + FT_UINT16, BASE_DEC, VALS(anqp_info_id_vals), 0, "Access Network Query Protocol Info ID", HFILL }}, {&hf_ieee80211_ff_anqp_info_length, @@ -13001,7 +13001,7 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_sa_query_action_code, {"Action code", "wlan_mgt.fixed.action_code", - FT_UINT8, BASE_DEC, VALS(&sa_query_action_codes), 0, + FT_UINT8, BASE_DEC, VALS(sa_query_action_codes), 0, "Management action code", HFILL }}, {&hf_ieee80211_ff_transaction_id, @@ -13358,13 +13358,13 @@ proto_register_ieee80211 (void) {&hf_ieee80211_rsn_cap_ptksa_replay_counter, {"RSN PTKSA Replay Counter capabilities", "wlan_mgt.rsn.capabilities.ptksa_replay_counter", - FT_UINT16, BASE_HEX, VALS(&rsn_cap_replay_counter), 0x000C, + FT_UINT16, BASE_HEX, VALS(rsn_cap_replay_counter), 0x000C, NULL, HFILL }}, {&hf_ieee80211_rsn_cap_gtksa_replay_counter, {"RSN GTKSA Replay Counter capabilities", "wlan_mgt.rsn.capabilities.gtksa_replay_counter", - FT_UINT16, BASE_HEX, VALS(&rsn_cap_replay_counter), 0x0030, + FT_UINT16, BASE_HEX, VALS(rsn_cap_replay_counter), 0x0030, NULL, HFILL }}, {&hf_ieee80211_rsn_cap_mfpr, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 35f63f8195..0255ecef3c 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -5216,7 +5216,7 @@ proto_register_isakmp(void) NULL, HFILL }}, { &hf_isakmp_notify_data_rohc_attr_type, { "ROHC Attribute Type", "isakmp.notify.data.rohc.attr.type", - FT_UINT16, BASE_DEC, VALS(&rohc_attr_type), 0x00, + FT_UINT16, BASE_DEC, VALS(rohc_attr_type), 0x00, NULL, HFILL }}, { &hf_isakmp_notify_data_rohc_attr_format, { "ROHC Format", "isakmp.notify.data.rohc.attr.format", @@ -5480,7 +5480,7 @@ proto_register_isakmp(void) "ISAKMP Transform Attribute", HFILL }}, { &hf_isakmp_tf_attr_type_v1, { "Transform Attribute Type", "isakmp.tf.attr.type_v1", - FT_UINT16, BASE_DEC, VALS(&transform_isakmp_attr_type), 0x00, + FT_UINT16, BASE_DEC, VALS(transform_isakmp_attr_type), 0x00, "ISAKMP (v1) Transform Attribute type", HFILL }}, { &hf_isakmp_tf_attr_format, { "Transform Format", "isakmp.tf.attr.format", @@ -5553,7 +5553,7 @@ proto_register_isakmp(void) "IKE Transform Attribute", HFILL }}, { &hf_isakmp_ike_attr_type, { "Transform IKE Attribute Type", "isakmp.ike.attr.type", - FT_UINT16, BASE_DEC, VALS(&transform_ike_attr_type), 0x00, + FT_UINT16, BASE_DEC, VALS(transform_ike_attr_type), 0x00, "IKE Transform Attribute type", HFILL }}, { &hf_isakmp_ike_attr_format, { "Transform IKE Format", "isakmp.ike.attr.format", @@ -5668,7 +5668,7 @@ proto_register_isakmp(void) "IKE2 Transform Attribute", HFILL }}, { &hf_isakmp_ike2_attr_type, { "Transform IKE2 Attribute Type", "isakmp.ike2.attr.type", - FT_UINT16, BASE_DEC, VALS(&transform_ike2_attr_type), 0x00, + FT_UINT16, BASE_DEC, VALS(transform_ike2_attr_type), 0x00, "IKE2 Transform Attribute type", HFILL }}, { &hf_isakmp_ike2_attr_format, { "Transform IKE2 Format", "isakmp.ike2.attr.format", diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index c5a57b1cc6..10d681054d 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -2238,7 +2238,7 @@ proto_register_mip6(void) { &hf_mip6_ba_status, { "Status", "mip6.ba.status", FT_UINT8, BASE_DEC, - VALS(&mip6_ba_status_value), 0, + VALS(mip6_ba_status_value), 0, "Binding Acknowledgement status", HFILL }}, { &hf_mip6_ba_k_flag, { "Key Management Compatibility (K) flag", "mip6.ba.k_flag", @@ -2270,7 +2270,7 @@ proto_register_mip6(void) { &hf_mip6_be_status, { "Status", "mip6.be.status", FT_UINT8, BASE_DEC, - VALS(&mip6_be_status_value), 0, + VALS(mip6_be_status_value), 0, "Binding Error status", HFILL }}, { &hf_mip6_be_haddr, { "Home Address", "mip6.be.haddr", FT_IPv6, BASE_NONE, NULL, 0, @@ -2301,7 +2301,7 @@ proto_register_mip6(void) { &hf_fmip6_fback_status, { "Status", "fmip6.fback.status", FT_UINT8, BASE_DEC, - VALS(&fmip6_fback_status_value), 0, + VALS(fmip6_fback_status_value), 0, "Fast Binding Acknowledgement status", HFILL }}, { &hf_fmip6_fback_k_flag, { "Key Management Compatibility (K) flag", "fmip6.fback.k_flag", diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 451bb41ff8..4bc911db80 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -1330,11 +1330,11 @@ void proto_register_synphasor(void) { &hf_data_statb05to04, { "Unlocked time", PROTOCOL_ABBREV ".data.t_unlock", FT_UINT16, BASE_HEX, - VALS(&data_statb05to04names), 0x0030, NULL, HFILL }}, + VALS(data_statb05to04names), 0x0030, NULL, HFILL }}, { &hf_data_statb03to00, { "Trigger reason", PROTOCOL_ABBREV ".data.trigger_reason", FT_UINT16, BASE_HEX, - VALS(&data_statb03to00names), 0x000F, NULL, HFILL }}, + VALS(data_statb03to00names), 0x000F, NULL, HFILL }}, /* Data type for command frame */ { &hf_command,