diff options
30 files changed, 83 insertions, 83 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index 6dcde5e774..d8ed35554e 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -705,11 +705,11 @@ proto_register_njack(void) 0x0, NULL, HFILL }}, { &hf_njack_tlv_snmpwrite, - { "TlvTypeSnmpwrite", "njack.tlv.snmpwrite", FT_UINT8, BASE_DEC, VALS(&njack_snmpwrite), + { "TlvTypeSnmpwrite", "njack.tlv.snmpwrite", FT_UINT8, BASE_DEC, VALS(njack_snmpwrite), 0x0, NULL, HFILL }}, { &hf_njack_tlv_dhcpcontrol, - { "TlvTypeDhcpControl", "njack.tlv.dhcpcontrol", FT_UINT8, BASE_DEC, VALS(&njack_dhcpcontrol), + { "TlvTypeDhcpControl", "njack.tlv.dhcpcontrol", FT_UINT8, BASE_DEC, VALS(njack_dhcpcontrol), 0x0, NULL, HFILL }}, { &hf_njack_tlv_devicemac, @@ -727,27 +727,27 @@ proto_register_njack(void) /* 1st tab */ { &hf_njack_tlv_scheduling, - { "TlvTypeScheduling", "njack.tlv.scheduling", FT_UINT8, BASE_DEC, VALS(&njack_scheduling), + { "TlvTypeScheduling", "njack.tlv.scheduling", FT_UINT8, BASE_DEC, VALS(njack_scheduling), 0x0, NULL, HFILL }}, { &hf_njack_tlv_addtagscheme, - { "TlvAddTagScheme", "njack.tlv.addtagscheme", FT_UINT8, BASE_DEC, VALS(&njack_addtagscheme), + { "TlvAddTagScheme", "njack.tlv.addtagscheme", FT_UINT8, BASE_DEC, VALS(njack_addtagscheme), 0x0, NULL, HFILL }}, { &hf_njack_tlv_portingressmode, - { "TlvTypePortingressmode", "njack.tlv.portingressmode", FT_UINT8, BASE_DEC, VALS(&njack_portingressmode), + { "TlvTypePortingressmode", "njack.tlv.portingressmode", FT_UINT8, BASE_DEC, VALS(njack_portingressmode), 0x0, NULL, HFILL }}, { &hf_njack_tlv_maxframesize, - { "TlvTypeMaxframesize", "njack.tlv.maxframesize", FT_UINT8, BASE_DEC, VALS(&njack_maxframesize), + { "TlvTypeMaxframesize", "njack.tlv.maxframesize", FT_UINT8, BASE_DEC, VALS(njack_maxframesize), 0x0, NULL, HFILL }}, { &hf_njack_tlv_countermode, - { "TlvTypeCountermode", "njack.tlv.countermode", FT_UINT8, BASE_DEC, VALS(&njack_countermode), + { "TlvTypeCountermode", "njack.tlv.countermode", FT_UINT8, BASE_DEC, VALS(njack_countermode), 0x0, NULL, HFILL }}, { &hf_njack_tlv_powerforwarding, - { "TlvTypePowerforwarding", "njack.tlv.powerforwarding", FT_UINT8, BASE_DEC, VALS(&njack_powerforwarding), + { "TlvTypePowerforwarding", "njack.tlv.powerforwarding", FT_UINT8, BASE_DEC, VALS(njack_powerforwarding), 0x0, NULL, HFILL }}, /* Type 0x07: set */ diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 6a4e5c7454..7cb64f5e05 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -981,15 +981,15 @@ proto_register_bpdu(void) static hf_register_info hf[] = { { &hf_bpdu_proto_id, { "Protocol Identifier", "stp.protocol", - FT_UINT16, BASE_HEX, VALS(&protocol_id_vals), 0x0, + FT_UINT16, BASE_HEX, VALS(protocol_id_vals), 0x0, NULL, HFILL }}, { &hf_bpdu_version_id, { "Protocol Version Identifier", "stp.version", - FT_UINT8, BASE_DEC, VALS(&version_id_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(version_id_vals), 0x0, NULL, HFILL }}, { &hf_bpdu_type, { "BPDU Type", "stp.type", - FT_UINT8, BASE_HEX, VALS(&bpdu_type_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(bpdu_type_vals), 0x0, NULL, HFILL }}, { &hf_bpdu_flags, { "BPDU flags", "stp.flags", diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index a66d54729e..fe0cd2c75b 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -200,11 +200,11 @@ proto_register_dec_bpdu(void) static hf_register_info hf[] = { { &hf_dec_bpdu_proto_id, { "Protocol Identifier", "dec_stp.protocol", - FT_UINT8, BASE_HEX, VALS(&protocol_id_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(protocol_id_vals), 0x0, NULL, HFILL }}, { &hf_dec_bpdu_type, { "BPDU Type", "dec_stp.type", - FT_UINT8, BASE_DEC, VALS(&bpdu_type_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(bpdu_type_vals), 0x0, NULL, HFILL }}, { &hf_dec_bpdu_version_id, { "BPDU Version", "dec_stp.version", diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index f341424982..ee3036bf2c 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -1333,15 +1333,15 @@ proto_register_dec_rt(void) NULL, HFILL }}, { &hf_dec_flow_control, { "Flow control", "dec_dna.nsp.flow_control", - FT_UINT8, BASE_HEX, VALS(&rt_flow_control_vals), 0x3, + FT_UINT8, BASE_HEX, VALS(rt_flow_control_vals), 0x3, "Flow control(stop, go)", HFILL }}, { &hf_dec_rt_services, { "Requested services", "dec_dna.nsp.services", - FT_UINT8, BASE_HEX, VALS(&rt_services_vals), 0x0c, + FT_UINT8, BASE_HEX, VALS(rt_services_vals), 0x0c, "Services requested", HFILL }}, { &hf_dec_rt_info, { "Version info", "dec_dna.nsp.info", - FT_UINT8, BASE_HEX, VALS(&rt_info_version_vals), 0x03, + FT_UINT8, BASE_HEX, VALS(rt_info_version_vals), 0x03, NULL, HFILL }}, { &hf_dec_rt_dst_node, { "Destination node", "dec_dna.dst_node", @@ -1370,15 +1370,15 @@ proto_register_dec_rt(void) /* Control messsage items */ { &hf_dec_ctl_msgs, { "Routing control message", "dec_dna.rt.msg_type", - FT_UINT8, BASE_HEX, VALS(&rt_msg_type_vals), 0xe, + FT_UINT8, BASE_HEX, VALS(rt_msg_type_vals), 0xe, "Routing control", HFILL }}, { &hf_dec_ctl_msg_hdr, { "Routing control message", "dec_dna.rt.msg_type", - FT_UINT8, BASE_HEX, VALS(&rt_msg_type_vals), 0xe, + FT_UINT8, BASE_HEX, VALS(rt_msg_type_vals), 0xe, "Routing control", HFILL }}, { &hf_dec_nsp_msgs, { "DNA NSP message", "dec_dna.nsp.msg_type", - FT_UINT8, BASE_HEX, VALS(&nsp_msg_type_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(nsp_msg_type_vals), 0x0, "NSP message", HFILL }}, { &hf_dec_rt_acknum, { "Ack/Nak", "dec_dna.ctl.acknum", @@ -1390,7 +1390,7 @@ proto_register_dec_rt(void) NULL, HFILL }}, { &hf_dec_rt_tiinfo, { "Routing information", "dec_dna.ctl.tiinfo", - FT_UINT8, BASE_HEX, VALS(&rt_tiinfo_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(rt_tiinfo_vals), 0x0, NULL, HFILL }}, { &hf_dec_rt_blk_size, { "Block size", "dec_dna.ctl.blk_size", @@ -1398,7 +1398,7 @@ proto_register_dec_rt(void) NULL, HFILL }}, { &hf_dec_disc_reason, { "Reason for disconnect","dec_dna.nsp.disc_reason", - FT_UINT16, BASE_HEX, VALS(&rt_disc_reason_vals), 0x0, + FT_UINT16, BASE_HEX, VALS(rt_disc_reason_vals), 0x0, "Disconnect reason", HFILL }}, { &hf_dec_rt_version, { "Version", "dec_dna.ctl.version", @@ -1434,7 +1434,7 @@ proto_register_dec_rt(void) NULL, HFILL }}, { &hf_dec_rt_iinfo_node_type, { "Node type", "dec_dna.ctl.iinfo.node_type", - FT_UINT8, BASE_HEX, VALS(&rt_iinfo_node_type_vals), 0x03, + FT_UINT8, BASE_HEX, VALS(rt_iinfo_node_type_vals), 0x03, NULL, HFILL }}, { &hf_dec_rt_iinfo_vrf, { "Verification required", "dec_dna.ctl.iinfo.vrf", diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index b3a9878417..9472a850cd 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1389,7 +1389,7 @@ void proto_register_dplay(void) NULL, 0x0, NULL, HFILL}}, { &hf_dplay_pp_dialect, { "PackedPlayer dialect version", "dplay.pp.dialect", FT_UINT32, BASE_HEX, - VALS(&dplay_proto_dialect_val), 0x0, NULL, HFILL}}, + VALS(dplay_proto_dialect_val), 0x0, NULL, HFILL}}, { &hf_dplay_pp_unknown_1, { "PackedPlayer unknown 1", "dplay.pp.unknown_1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1460,7 +1460,7 @@ void proto_register_dplay(void) VALS(dplay_spp_length_val), 0x0, NULL, HFILL}}, { &hf_dplay_spp_dialect, { "SuperPackedPlayer dialect version", "dplay.spp.dialect", FT_UINT32, BASE_HEX, - VALS(&dplay_proto_dialect_val), 0x0, NULL, HFILL}}, + VALS(dplay_proto_dialect_val), 0x0, NULL, HFILL}}, { &hf_dplay_spp_sys_player_id, { "SuperPackedPlayer system player ID", "dplay.spp.sysplayer_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 92b82e55a0..ce80abb070 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -332,7 +332,7 @@ proto_register_eapol(void) { &hf_eapol_wpa_keydes_keyinfo_keydes_ver, { "Key Descriptor Version", "eapol.keydes.key_info.keydes_ver", - FT_UINT16, BASE_DEC, VALS(&keydes_ver), + FT_UINT16, BASE_DEC, VALS(keydes_ver), KEY_INFO_KEYDES_VER_MASK, "Key Descriptor Version Type", HFILL }}, { &hf_eapol_wpa_keydes_keyinfo_key_type, { diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index 11b60ebf58..5e0993ba31 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -288,10 +288,10 @@ proto_register_fcoe(void) /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { { &hf_fcoe_sof, - {"SOF", "fcoe.sof", FT_UINT8, BASE_HEX, VALS(&fcoe_sof_vals), 0, + {"SOF", "fcoe.sof", FT_UINT8, BASE_HEX, VALS(fcoe_sof_vals), 0, NULL, HFILL}}, { &hf_fcoe_eof, - {"EOF", "fcoe.eof", FT_UINT8, BASE_HEX, VALS(&fcoe_eof_vals), 0, + {"EOF", "fcoe.eof", FT_UINT8, BASE_HEX, VALS(fcoe_eof_vals), 0, NULL, HFILL}}, { &hf_fcoe_ver, {"Version", "fcoe.ver", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 95584bde56..5716e505d9 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -473,19 +473,19 @@ proto_register_fip(void) NULL, 0xf0, NULL, HFILL}}, { &hf_fip_op, {"Opcode", "fip.opcode", FT_UINT16, BASE_HEX, - VALS(&fip_opcodes), 0, NULL, HFILL}}, + VALS(fip_opcodes), 0, NULL, HFILL}}, { &hf_fip_disc_subcode, {"Discovery Subcode", "fip.disc_subcode", FT_UINT8, BASE_HEX, - VALS(&fip_disc_subcodes), 0, NULL, HFILL}}, + VALS(fip_disc_subcodes), 0, NULL, HFILL}}, { &hf_fip_ls_subcode, {"Link Service Subcode", "fip.ls.subcode", FT_UINT8, BASE_HEX, - VALS(&fip_ls_subcodes), 0, NULL, HFILL}}, + VALS(fip_ls_subcodes), 0, NULL, HFILL}}, { &hf_fip_ctrl_subcode, {"Control Subcode", "fip.ctrl_subcode", FT_UINT8, BASE_HEX, - VALS(&fip_ctrl_subcodes), 0, NULL, HFILL}}, + VALS(fip_ctrl_subcodes), 0, NULL, HFILL}}, { &hf_fip_vlan_subcode, {"VLAN Subcode", "fip.vlan_subcode", FT_UINT8, BASE_HEX, - VALS(&fip_vlan_subcodes), 0, NULL, HFILL}}, + VALS(fip_vlan_subcodes), 0, NULL, HFILL}}, { &hf_fip_hex_subcode, {"Unknown Subcode", "fip.subcode", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}}, @@ -512,7 +512,7 @@ proto_register_fip(void) NULL, FIP_FL_FPORT, NULL, HFILL}}, { &hf_fip_desc_type, {"Descriptor Type", "fip.desc_type", FT_UINT8, BASE_HEX, - VALS(&fip_desc_types), 0, NULL, HFILL}}, + VALS(fip_desc_types), 0, NULL, HFILL}}, { &hf_fip_desc_len, {"Descriptor Length (words)", "fip.desc_len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 29c5658eda..8f92ca8a44 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -6327,7 +6327,7 @@ proto_register_gsm_a_dtap(void) }, { &hf_gsm_a_dtap_alerting_pattern, { "Alerting Pattern", "gsm_a.dtap.alerting_pattern", - FT_UINT8, BASE_DEC, VALS(&gsm_a_alerting_pattern_vals), 0x0f, + FT_UINT8, BASE_DEC, VALS(gsm_a_alerting_pattern_vals), 0x0f, NULL, HFILL } }, { &hf_gsm_a_dtap_ccbs_activation, diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index e4e9011600..c343e2c8ad 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -9916,12 +9916,12 @@ proto_register_gsm_a_rr(void) }, { &hf_gsm_a_rr_psi1_repeat_period, { "PSI1 Repeat Period", "gsm_a.rr.psi1_repeat_period", - FT_UINT8, BASE_DEC, VALS(&gsm_a_rr_psi1_repeat_period_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(gsm_a_rr_psi1_repeat_period_vals), 0x0, NULL, HFILL } }, { &hf_gsm_a_rr_pbcch_pb, { "Pb", "gsm_a.rr.pbcch_pb", - FT_UINT8, BASE_DEC, VALS(&gsm_a_rr_pbcch_pb_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(gsm_a_rr_pbcch_pb_vals), 0x0, "Power reduction on PBCCH/PCCCH (Pb)", HFILL } }, { &hf_gsm_a_rr_pbcch_tsc, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 2c1d3affa4..b19d69db26 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -9435,11 +9435,11 @@ proto_register_ieee80211 (void) {&hf_block_ack_request_type, {"Block Ack Request Type", "wlan.bar.type", - FT_UINT8, BASE_HEX, VALS(&hf_block_ack_request_type_flags), 0, "Block Ack Request (BAR) Type", HFILL }}, + FT_UINT8, BASE_HEX, VALS(hf_block_ack_request_type_flags), 0, "Block Ack Request (BAR) Type", HFILL }}, {&hf_block_ack_type, {"Block Ack Type", "wlan.ba.type", - FT_UINT8, BASE_HEX, VALS(&hf_block_ack_type_flags), 0, NULL, HFILL }}, + FT_UINT8, BASE_HEX, VALS(hf_block_ack_type_flags), 0, NULL, HFILL }}, {&hf_block_ack_bitmap, {"Block Ack Bitmap", "wlan.ba.bm", @@ -11247,7 +11247,7 @@ proto_register_ieee80211 (void) {&hf_tag_measure_request_measurement_mode, {"Measurement Mode", "wlan_mgt.measure.req.measurementmode", - FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_measurement_mode_flags), 0, NULL, HFILL }}, + FT_UINT8, BASE_HEX, VALS(hf_tag_measure_request_measurement_mode_flags), 0, NULL, HFILL }}, {&hf_tag_measure_request_bssid, {"BSSID", "wlan_mgt.measure.req.bssid", @@ -11255,7 +11255,7 @@ proto_register_ieee80211 (void) {&hf_tag_measure_request_reporting_condition, {"Reporting Condition", "wlan_mgt.measure.req.repcond", - FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_reporting_condition_flags), 0, NULL, HFILL }}, + FT_UINT8, BASE_HEX, VALS(hf_tag_measure_request_reporting_condition_flags), 0, NULL, HFILL }}, {&hf_tag_measure_request_threshold_offset_unsigned, {"Threshold/Offset", "wlan_mgt.measure.req.threshold", @@ -11271,7 +11271,7 @@ proto_register_ieee80211 (void) {&hf_tag_measure_request_group_id, {"Group ID", "wlan_mgt.measure.req.groupid", - FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_group_id_flags), 0, NULL, HFILL }}, + FT_UINT8, BASE_HEX, VALS(hf_tag_measure_request_group_id_flags), 0, NULL, HFILL }}, /*** End: Measurement Request Tag - Dustin Johnson***/ /*** Start: Measurement Report Tag - Dustin Johnson***/ diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 5609c8c403..bd88f6a2cf 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -1173,7 +1173,7 @@ proto_register_igmp(void) { &hf_mtrace_q_rtg_proto, { "Rtg Protocol", "igmp.mtrace.q_rtg_proto", FT_UINT8, BASE_DEC, - VALS(&mtrace_rtg_vals), 0, "Routing protocol between this and previous hop rtr", HFILL }}, + VALS(mtrace_rtg_vals), 0, "Routing protocol between this and previous hop rtr", HFILL }}, { &hf_mtrace_q_fwd_ttl, { "FwdTTL", "igmp.mtrace.q_fwd_ttl", FT_UINT8, BASE_DEC, @@ -1193,7 +1193,7 @@ proto_register_igmp(void) { &hf_mtrace_q_fwd_code, { "Forwarding Code", "igmp.mtrace.q_fwd_code", FT_UINT8, BASE_HEX, - VALS(&mtrace_fwd_code_vals), 0, "Forwarding information/error code", HFILL }}, + VALS(mtrace_fwd_code_vals), 0, "Forwarding information/error code", HFILL }}, }; static gint *ett[] = { diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index c8b815c509..8cd6f3629e 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1699,7 +1699,7 @@ proto_register_ipv6(void) "Routing Header Option", HFILL }}, { &hf_ipv6_routing_hdr_type, { "Type", "ipv6.routing_hdr.type", - FT_UINT8, BASE_DEC, VALS(&routing_header_type), 0x0, + FT_UINT8, BASE_DEC, VALS(routing_header_type), 0x0, "Routeing Header Type", HFILL }}, { &hf_ipv6_routing_hdr_left, { "Left Segments", "ipv6.routing_hdr.left", diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index c21308ae1c..e3413bb297 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -261,7 +261,7 @@ proto_register_ipvs_syncd(void) { &hf_proto, { "Protocol", "ipvs.proto", FT_UINT8, BASE_HEX, - VALS(&proto_strings), 0, NULL, HFILL }}, + VALS(proto_strings), 0, NULL, HFILL }}, { &hf_cport, { "Client Port", "ipvs.cport", FT_UINT16, BASE_DEC, @@ -293,7 +293,7 @@ proto_register_ipvs_syncd(void) { &hf_state, { "State", "ipvs.state", FT_UINT16, BASE_HEX, - VALS(&state_strings), 0, NULL, HFILL }}, + VALS(state_strings), 0, NULL, HFILL }}, { &hf_in_seq_init, { "Input Sequence (Initial)", "ipvs.in_seq.initial", FT_UINT32, diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index a02e3cbcc3..1e07bcebd7 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -1468,7 +1468,7 @@ void proto_register_isns(void) }, { &hf_isns_function_id, { "Function ID","isns.functionid", - FT_UINT16, BASE_DEC,VALS(&isns_function_ids),0, + FT_UINT16, BASE_DEC,VALS(isns_function_ids),0, "iSNS Function ID" ,HFILL} }, { &hf_isns_pdu_length, diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 1c7bfc0b69..c8c2e3afd1 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -994,7 +994,7 @@ proto_register_ppi(void) { &hf_ppi_field_type, { "Field type", "ppi.field_type", - FT_UINT16, BASE_DEC, VALS(&vs_ppi_field_type), 0x0, "PPI data field type", HFILL } }, + FT_UINT16, BASE_DEC, VALS(vs_ppi_field_type), 0x0, "PPI data field type", HFILL } }, { &hf_ppi_field_len, { "Field length", "ppi.field_len", FT_UINT16, BASE_DEC, NULL, 0x0, "PPI data field length", HFILL } }, @@ -1026,7 +1026,7 @@ proto_register_ppi(void) "PPI 802.11-Common Channel Frequency", HFILL } }, { &hf_80211_common_chan_flags, { "Channel type", "ppi.80211-common.chan.type", - FT_UINT16, BASE_HEX, VALS(&vs_80211_common_phy_type), 0x0, "PPI 802.11-Common Channel Type", HFILL } }, + FT_UINT16, BASE_HEX, VALS(vs_80211_common_phy_type), 0x0, "PPI 802.11-Common Channel Type", HFILL } }, { &hf_80211_common_chan_flags_turbo, { "Turbo", "ppi.80211-common.chan.type.turbo", @@ -1141,7 +1141,7 @@ proto_register_ppi(void) FT_UINT16, BASE_DEC, NULL, 0x0, "PPI 802.11n MAC+PHY Extended Channel Frequency", HFILL } }, { &hf_80211n_mac_phy_ext_chan_flags, { "Channel type", "ppi.80211-mac-phy.ext-chan.type", - FT_UINT16, BASE_HEX, VALS(&vs_80211_common_phy_type), 0x0, "PPI 802.11n MAC+PHY Channel Type", HFILL } }, + FT_UINT16, BASE_HEX, VALS(vs_80211_common_phy_type), 0x0, "PPI 802.11n MAC+PHY Channel Type", HFILL } }, { &hf_80211n_mac_phy_ext_chan_flags_turbo, { "Turbo", "ppi.80211-mac-phy.ext-chan.type.turbo", FT_BOOLEAN, 16, NULL, 0x0010, "PPI 802.11n MAC+PHY Channel Type Turbo", HFILL } }, diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index 08283d5cee..5ea20e0239 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -255,7 +255,7 @@ void proto_register_roofnet(void) { &hf_roofnet_type, { "Type", "roofnet.type", - FT_UINT8, BASE_DEC, VALS(&roofnet_pt_vals), 0x0, "Roofnet Message Type", HFILL } + FT_UINT8, BASE_DEC, VALS(roofnet_pt_vals), 0x0, "Roofnet Message Type", HFILL } }, { &hf_roofnet_nlinks, @@ -280,7 +280,7 @@ void proto_register_roofnet(void) { &hf_roofnet_flags, { "Flags", "roofnet.flags", - FT_UINT16, BASE_DEC, VALS(&roofnet_flags_vals), 0x0, "Roofnet Flags", HFILL } + FT_UINT16, BASE_DEC, VALS(roofnet_flags_vals), 0x0, "Roofnet Flags", HFILL } }, { &hf_roofnet_data_length, diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 6ad82ccfc1..757eb9dda3 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -327,7 +327,7 @@ void proto_register_sap(void) { &hf_auth_flags_v, { "Version Number", "sap.auth.flags.v", - FT_UINT8, BASE_DEC, VALS(&mcast_sap_auth_ver), MCAST_SAP_VERSION_MASK, + FT_UINT8, BASE_DEC, VALS(mcast_sap_auth_ver), MCAST_SAP_VERSION_MASK, "Version", HFILL }}, { &hf_auth_flags_p, @@ -337,7 +337,7 @@ void proto_register_sap(void) { &hf_auth_flags_t, { "Authentication Type", "sap.auth.flags.t", - FT_UINT8, BASE_DEC, VALS(&mcast_sap_auth_type), MCAST_SAP_AUTH_TYPE_MASK, + FT_UINT8, BASE_DEC, VALS(mcast_sap_auth_type), MCAST_SAP_AUTH_TYPE_MASK, "Auth type", HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index f769957d25..cf2c9551a5 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -2312,7 +2312,7 @@ proto_register_sigcomp(void) }, { &hf_sigcomp_len, { "Partial state id length","sigcomp.length", - FT_UINT8, BASE_HEX, VALS(&length_encoding_vals), 0x03, + FT_UINT8, BASE_HEX, VALS(length_encoding_vals), 0x03, "Sigcomp length", HFILL } }, { &hf_sigcomp_returned_feedback_item, @@ -2347,7 +2347,7 @@ proto_register_sigcomp(void) }, { &hf_sigcomp_destination, { "Destination","sigcomp.destination", - FT_UINT8, BASE_HEX, VALS(&destination_address_encoding_vals), 0xf, + FT_UINT8, BASE_HEX, VALS(destination_address_encoding_vals), 0xf, NULL, HFILL } }, { &hf_sigcomp_udvm_bytecode, @@ -2357,7 +2357,7 @@ proto_register_sigcomp(void) }, { &hf_sigcomp_udvm_instr, { "UDVM instruction code","sigcomp.udvm.instr", - FT_UINT8, BASE_DEC, VALS(&udvm_instruction_code_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(udvm_instruction_code_vals), 0x0, NULL, HFILL } }, { &hf_udvm_execution_trace, @@ -2367,17 +2367,17 @@ proto_register_sigcomp(void) }, { &hf_udvm_multitype_bytecode, { "UDVM bytecode", "sigcomp.udvm.multyt.bytecode", - FT_UINT8, BASE_HEX, VALS(&display_bytecode_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(display_bytecode_vals), 0x0, NULL, HFILL } }, { &hf_udvm_reference_bytecode, { "UDVM bytecode", "sigcomp.udvm.ref.bytecode", - FT_UINT8, BASE_HEX, VALS(&display_ref_bytecode_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(display_ref_bytecode_vals), 0x0, NULL, HFILL } }, { &hf_udvm_literal_bytecode, { "UDVM bytecode", "sigcomp.udvm.lit.bytecode", - FT_UINT8, BASE_HEX, VALS(&display_lit_bytecode_vals), 0x0, + FT_UINT8, BASE_HEX, VALS(display_lit_bytecode_vals), 0x0, NULL, HFILL } }, { &hf_udvm_operand, diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index b687eb2cce..3afe6cce80 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -233,7 +233,7 @@ void proto_register_sita(void) { static hf_register_info hf[] = { - { &hf_proto, { "Protocol", "sita.errors.protocol", FT_UINT8, BASE_HEX, VALS(&tfs_sita_proto), 0, "Protocol value", HFILL }}, + { &hf_proto, { "Protocol", "sita.errors.protocol", FT_UINT8, BASE_HEX, VALS(tfs_sita_proto), 0, "Protocol value", HFILL }}, { &hf_dir, { "Direction", "sita.flags.flags", FT_BOOLEAN, 8, TFS(&tfs_sita_flags), SITA_FRAME_DIR, "TRUE 'from Remote', FALSE 'from Local'", HFILL }}, { &hf_droppedframe, { "No Buffers", "sita.flags.droppedframe", FT_BOOLEAN, 8, TFS(&tfs_sita_error), SITA_ERROR_NO_BUFFER, "TRUE if Buffer Failure", HFILL }}, diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 151382652a..3465132a86 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -3197,7 +3197,7 @@ proto_register_slow_protocols(void) { &hf_oampdu_info_state_parser, { "Parser Action", "slow.oam.info.state.parser", - FT_UINT8, BASE_HEX, VALS(&parser_vals), 0x03, + FT_UINT8, BASE_HEX, VALS(parser_vals), 0x03, NULL, HFILL }}, { &hf_oampdu_info_state_mux, diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index d1f05911bc..d4c9638b72 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -909,7 +909,7 @@ proto_register_smb_browse(void) { &hf_mb_reset_command, { "ResetBrowserState Command", "browser.reset_cmd", FT_UINT8, - BASE_HEX, VALS(&resetbrowserstate_command_names), 0, + BASE_HEX, VALS(resetbrowserstate_command_names), 0, NULL, HFILL }}, { &hf_mb_reset_demote, { "Demote LMB", "browser.reset_cmd.demote", FT_BOOLEAN, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 8797140bc3..35f6ffb1c7 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -19508,7 +19508,7 @@ proto_register_smb(void) { &hf_smb_posix_ace_type, { "ACE Type", "smb.posix_acl.ace_type", FT_UINT8, BASE_DEC, - VALS(&ace_type_vals), 0, NULL, HFILL }}, + VALS(ace_type_vals), 0, NULL, HFILL }}, { &hf_smb_posix_ace_flags, { "Permissions", "smb.posix_acl.ace_perms", FT_UINT8, BASE_HEX, diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 6bb2ff38f4..7c74326dbe 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -1350,7 +1350,7 @@ void proto_register_synphasor(void) /* Data type for command frame */ { &hf_command, { "Command", PROTOCOL_ABBREV ".command", FT_UINT16, BASE_HEX, - VALS(&command_names), 0x000F, NULL, HFILL }} + VALS(command_names), 0x000F, NULL, HFILL }} }; /* protocol subtree array */ diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 99bdcaacaa..e55a4eee6d 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -2628,42 +2628,42 @@ proto_register_vnc(void) /* Client Pointer Event */ { &hf_vnc_button_1_pos, { "Mouse button #1 position", "vnc.button_1_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x1, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x1, "Whether mouse button #1 is being pressed or not", HFILL } }, { &hf_vnc_button_2_pos, { "Mouse button #2 position", "vnc.button_2_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x2, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x2, "Whether mouse button #2 is being pressed or not", HFILL } }, { &hf_vnc_button_3_pos, { "Mouse button #3 position", "vnc.button_3_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x4, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x4, "Whether mouse button #3 is being pressed or not", HFILL } }, { &hf_vnc_button_4_pos, { "Mouse button #4 position", "vnc.button_4_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x8, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x8, "Whether mouse button #4 is being pressed or not", HFILL } }, { &hf_vnc_button_5_pos, { "Mouse button #5 position", "vnc.button_5_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x10, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x10, "Whether mouse button #5 is being pressed or not", HFILL } }, { &hf_vnc_button_6_pos, { "Mouse button #6 position", "vnc.button_6_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x20, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x20, "Whether mouse button #6 is being pressed or not", HFILL } }, { &hf_vnc_button_7_pos, { "Mouse button #7 position", "vnc.button_7_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x40, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x40, "Whether mouse button #7 is being pressed or not", HFILL } }, { &hf_vnc_button_8_pos, { "Mouse button #8 position", "vnc.button_8_pos", - FT_UINT8, BASE_DEC, VALS(&button_mask_vs), 0x80, + FT_UINT8, BASE_DEC, VALS(button_mask_vs), 0x80, "Whether mouse button #8 is being pressed or not", HFILL } }, { &hf_vnc_pointer_x_pos, diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 1fd66b5d72..cc577ccd89 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -1666,15 +1666,15 @@ void proto_register_ecat(void) }, { &hf_ecat_length_r, { "Reserved", "ecat.subframe.reserved", - FT_UINT16, BASE_DEC, VALS(&ecat_subframe_reserved_vals), 0x3800, NULL, HFILL} + FT_UINT16, BASE_DEC, VALS(ecat_subframe_reserved_vals), 0x3800, NULL, HFILL} }, { &hf_ecat_length_c, { "Round trip", "ecat.subframe.circulating", - FT_UINT16, BASE_DEC, VALS(&ecat_subframe_circulating_vals), 0x4000, NULL, HFILL} + FT_UINT16, BASE_DEC, VALS(ecat_subframe_circulating_vals), 0x4000, NULL, HFILL} }, { &hf_ecat_length_m, { "Last indicator", "ecat.subframe.more", - FT_UINT16, BASE_DEC, VALS(&ecat_subframe_more_vals), 0x8000, NULL, HFILL} + FT_UINT16, BASE_DEC, VALS(ecat_subframe_more_vals), 0x8000, NULL, HFILL} }, { &hf_ecat_padding, { "Pad bytes", "ecat.subframe.pad_bytes", diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index 0369b60c70..b17af4afae 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -119,7 +119,7 @@ void proto_register_ethercat_frame(void) { &hf_ethercat_frame_reserved, { "Reserved", "ecatf.reserved", - FT_UINT16, BASE_HEX, VALS(ðercat_frame_reserved_vals), 0x0800, + FT_UINT16, BASE_HEX, VALS(ethercat_frame_reserved_vals), 0x0800, NULL, HFILL} }, diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 2bb4b12ee3..eba27bcf5e 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -2030,7 +2030,7 @@ void proto_register_irda(void) NULL, HFILL }}, { &hf_xid_s, { "Number of Slots", "irlap.xid.s", - FT_UINT8, BASE_DEC, VALS(&xid_slot_numbers), S_MASK, + FT_UINT8, BASE_DEC, VALS(xid_slot_numbers), S_MASK, NULL, HFILL }}, { &hf_xid_conflict, { "Conflict", "irlap.xid.conflict", diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 59437b40f2..8252a79cec 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -121,7 +121,7 @@ void proto_register_mac_mgmt_msg_prc_lt_ctrl(void) { "Setup/Tear-down long-term precoding with feedback", "wimax.prc_lt_ctrl.precoding", - FT_UINT8, BASE_DEC, VALS(&vals_turn_on), 0x80, NULL, HFILL + FT_UINT8, BASE_DEC, VALS(vals_turn_on), 0x80, NULL, HFILL } }, { diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index e265558006..0c78d3f8ef 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -834,7 +834,7 @@ void proto_register_wimax_utility_decoders(void) }, { /* 23 ARQ Sync Loss Timeout */ &hf_sfe_arq_sync_loss_timeout, - {"ARQ Sync Loss Timeout (10us granularity)", "wmx.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_sync_loss_timeout), 0x0, NULL, HFILL} + {"ARQ Sync Loss Timeout (10us granularity)", "wmx.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(vals_arq_sync_loss_timeout), 0x0, NULL, HFILL} }, { /* 20 ARQ Transmitter Delay */ &hf_sfe_arq_transmitter_delay_cor2, @@ -850,15 +850,15 @@ void proto_register_wimax_utility_decoders(void) }, { /* 23 ARQ Sync Loss Timeout */ &hf_sfe_arq_sync_loss_timeout_cor2, - {"ARQ Sync Loss Timeout (100us granularity)", "wmx.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_sync_loss_timeout), 0x0, NULL, HFILL} + {"ARQ Sync Loss Timeout (100us granularity)", "wmx.arq.sync_loss_timeout", FT_UINT16, BASE_DEC, VALS(vals_arq_sync_loss_timeout), 0x0, NULL, HFILL} }, { /* 24 ARQ Deliver In Order */ &hf_sfe_arq_deliver_in_order, - {"ARQ Deliver In Order", "wmx.arq.deliver_in_order", FT_UINT8, BASE_DEC, VALS(&vals_arq_deliver_in_order), 0x0, NULL, HFILL} + {"ARQ Deliver In Order", "wmx.arq.deliver_in_order", FT_UINT8, BASE_DEC, VALS(vals_arq_deliver_in_order), 0x0, NULL, HFILL} }, { /* 25 ARQ Purge Timeout */ &hf_sfe_arq_rx_purge_timeout, - {"ARQ RX Purge Timeout (100us granularity)", "wmx.arq.rx_purge_timeout", FT_UINT16, BASE_DEC, VALS(&vals_arq_rx_purge_timeout), 0x0, NULL, HFILL} + {"ARQ RX Purge Timeout (100us granularity)", "wmx.arq.rx_purge_timeout", FT_UINT16, BASE_DEC, VALS(vals_arq_rx_purge_timeout), 0x0, NULL, HFILL} }, { /* 26 ARQ Block Size */ &hf_sfe_arq_block_size, |