osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

(Benign) Don't use "address-of" operator on arg of VALS() (not that it makes any actual difference).. 

Change-Id: I0766d0f130648aaa5a58d9f4062fa24e898cbdc3
Reviewed-on: https://code.wireshark.org/review/545
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2014-03-06 23:55:37 -05:00
parent fc2be9eac4
commit 4fbcfc1289
15 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-batadv.c
View File

@ -3366,7 +3366,7 @@ void proto_register_batadv(void)
},
{ &hf_batadv_unicast_4addr_subtype,
{ "Subtype", "batadv.unicast_4addr.subtype",
FT_UINT8, BASE_DEC, VALS (&unicast_4addr_typenames), 0x0,
FT_UINT8, BASE_DEC, VALS (unicast_4addr_typenames), 0x0,
NULL, HFILL }
},
{ &hf_batadv_unicast_frag_version,
@ -3491,7 +3491,7 @@ void proto_register_batadv(void)
},
{ &hf_batadv_tt_query_flags_type,
{ "Query Type", "batadv.tt_query.flags.type",
FT_UINT8, BASE_HEX, VALS (&tt_query_type_v14), TT_TYPE_MASK,
FT_UINT8, BASE_HEX, VALS (tt_query_type_v14), TT_TYPE_MASK,
NULL, HFILL }
},
{ &hf_batadv_tt_query_flags_full_table,

2
epan/dissectors/packet-bgp.c
View File

@ -6972,7 +6972,7 @@ proto_register_bgp(void)
TFS(&tfs_set_notset), BGPNLRI_FSPEC_AND_BIT, NULL, HFILL }},
{ &hf_bgp_flowspec_nlri_op_val_len,
{ "Value length", "bgp.flowspec_nlri.op.val_len", FT_UINT8, BASE_DEC,
VALS(&flow_spec_op_len_val), BGPNLRI_FSPEC_VAL_LEN, NULL, HFILL }},
VALS(flow_spec_op_len_val), BGPNLRI_FSPEC_VAL_LEN, NULL, HFILL }},
{ &hf_bgp_flowspec_nlri_op_un_bit4,
{ "Reserved", "bgp.flowspec_nlri.op.un_bit4", FT_BOOLEAN, 8,
TFS(&tfs_set_notset), BGPNLRI_FSPEC_UNUSED_BIT4, "Unused (must be zero)",HFILL}},

12
epan/dissectors/packet-dmp.c
View File

@ -4289,13 +4289,13 @@ void proto_register_dmp (void)
*/
{ &hf_addr_ext_form,
{ "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
VALS (&addr_form), 0xE0, NULL, HFILL } },
VALS (addr_form), 0xE0, NULL, HFILL } },
{ &hf_addr_ext_form_orig_v1,
{ "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
VALS (&addr_form_orig_v1), 0xE0, NULL, HFILL } },
VALS (addr_form_orig_v1), 0xE0, NULL, HFILL } },
{ &hf_addr_ext_form_orig,
{ "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
VALS (&addr_form_orig), 0xE0, NULL, HFILL } },
VALS (addr_form_orig), 0xE0, NULL, HFILL } },
{ &hf_addr_ext_action,
{ "Action", "dmp.action", FT_BOOLEAN, 8,
TFS (&tfs_yes_no), 0x10, NULL, HFILL } },
@ -4325,10 +4325,10 @@ void proto_register_dmp (void)
NULL, 0x0, NULL, HFILL } },
{ &hf_addr_ext_type,
{ "Address Type", "dmp.addr_type", FT_UINT8, BASE_DEC,
VALS (&ext_addr_type), 0xE0, NULL, HFILL } },
VALS (ext_addr_type), 0xE0, NULL, HFILL } },
{ &hf_addr_ext_type_ext,
{ "Address Type Extended", "dmp.addr_type_ext", FT_UINT8,
BASE_DEC, VALS (&ext_addr_type_ext), 0xE0, NULL,
BASE_DEC, VALS (ext_addr_type_ext), 0xE0, NULL,
HFILL } },
{ &hf_addr_ext_length,
{ "Address Length", "dmp.addr_length", FT_UINT8,
@ -4687,7 +4687,7 @@ void proto_register_dmp (void)
NULL, 0x0, NULL, HFILL } },
{ &hf_ack_reason,
{ "Ack Reason", "dmp.ack_reason", FT_UINT8, BASE_DEC,
VALS (&ack_reason), 0x0, "Reason", HFILL } },
VALS (ack_reason), 0x0, "Reason", HFILL } },
{ &hf_ack_diagnostic,
{ "Ack Diagnostic", "dmp.ack_diagnostic", FT_UINT8, BASE_DEC,
NULL, 0x0, "Diagnostic", HFILL } },

4
epan/dissectors/packet-fcip.c
View File

@ -577,13 +577,13 @@ proto_register_fcip (void)
NULL, 0, NULL, HFILL}},
{ &hf_fcip_sof,
{"SOF", "fcip.sof", FT_UINT8, BASE_HEX,
VALS (&fcip_sof_vals), 0, NULL, HFILL}},
VALS (fcip_sof_vals), 0, NULL, HFILL}},
{ &hf_fcip_sof_c,
{"SOF (1's Complement)", "fcip.sofc", FT_UINT8, BASE_HEX,
NULL, 0, NULL, HFILL}},
{ &hf_fcip_eof,
{"EOF", "fcip.eof", FT_UINT8, BASE_HEX,
VALS (&fcip_eof_vals), 0, NULL, HFILL}},
VALS (fcip_eof_vals), 0, NULL, HFILL}},
{ &hf_fcip_eof_c,
{"EOF (1's Complement)", "fcip.eofc", FT_UINT8, BASE_HEX,
NULL, 0, NULL, HFILL}},

4
epan/dissectors/packet-frame.c
View File

@ -710,12 +710,12 @@ proto_register_frame(void)
{ &hf_frame_pack_direction,
{ "Direction", "frame.packet_flags_direction",
FT_UINT32, BASE_HEX, VALS(&packet_word_directions), PACKET_WORD_DIRECTION_MASK,
FT_UINT32, BASE_HEX, VALS(packet_word_directions), PACKET_WORD_DIRECTION_MASK,
NULL, HFILL }},
{ &hf_frame_pack_reception_type,
{ "Reception type", "frame.packet_flags_reception_type",
FT_UINT32, BASE_DEC, VALS(&packet_word_reception_types), PACKET_WORD_RECEPTION_TYPE_MASK,
FT_UINT32, BASE_DEC, VALS(packet_word_reception_types), PACKET_WORD_RECEPTION_TYPE_MASK,
NULL, HFILL }},
{ &hf_frame_pack_fcs_length,

6
epan/dissectors/packet-gsm_a_dtap.c
View File

@ -6686,9 +6686,9 @@ proto_register_gsm_a_dtap(void)
{ &hf_gsm_a_dtap_configuration, { "Configuration", "gsm_a.dtap.configuration", FT_BOOLEAN, 8, TFS(&tfs_bearer_cap_configuration), 0x04, NULL, HFILL }},
{ &hf_gsm_a_dtap_nirr, { "NIRR", "gsm_a.dtap.nirr", FT_BOOLEAN, 8, TFS(&tfs_nirr), 0x02, NULL, HFILL }},
{ &hf_gsm_a_dtap_establishment, { "Establishment", "gsm_a.dtap.establishment", FT_BOOLEAN, 8, TFS(&tfs_bearer_cap_establishment), 0x01, NULL, HFILL }},
{ &hf_gsm_a_dtap_access_identity, { "Access Identity", "gsm_a.dtap.access_identity", FT_UINT8, BASE_DEC, VALS(&gsm_a_dtap_access_identity_vals), 0x60, NULL, HFILL }},
{ &hf_gsm_a_dtap_rate_adaption, { "Rate Adaption", "gsm_a.dtap.rate_adaption", FT_UINT8, BASE_DEC, VALS(&gsm_a_dtap_rate_adaption_vals), 0x18, NULL, HFILL }},
{ &hf_gsm_a_dtap_signalling_access_protocol, { "Signalling Access Protocol", "gsm_a.dtap.signalling_access_protocol", FT_UINT8, BASE_DEC, VALS(&gsm_a_dtap_signal_access_protocol_vals), 0x07, NULL, HFILL }},
{ &hf_gsm_a_dtap_access_identity, { "Access Identity", "gsm_a.dtap.access_identity", FT_UINT8, BASE_DEC, VALS(gsm_a_dtap_access_identity_vals), 0x60, NULL, HFILL }},
{ &hf_gsm_a_dtap_rate_adaption, { "Rate Adaption", "gsm_a.dtap.rate_adaption", FT_UINT8, BASE_DEC, VALS(gsm_a_dtap_rate_adaption_vals), 0x18, NULL, HFILL }},
{ &hf_gsm_a_dtap_signalling_access_protocol, { "Signalling Access Protocol", "gsm_a.dtap.signalling_access_protocol", FT_UINT8, BASE_DEC, VALS(gsm_a_dtap_signal_access_protocol_vals), 0x07, NULL, HFILL }},
{ &hf_gsm_a_dtap_other_itc, { "Other ITC", "gsm_a.dtap.other_itc", FT_UINT8, BASE_DEC, VALS(gsm_a_dtap_other_itc_vals), 0x60, NULL, HFILL }},
{ &hf_gsm_a_dtap_other_rate_adaption, { "Other Rate Adaption", "gsm_a.dtap.other_rate_adaption", FT_UINT8, BASE_DEC, VALS(gsm_a_dtap_other_rate_adaption_vals), 0x18, NULL, HFILL }},
{ &hf_gsm_a_dtap_rate_adaption_header, { "Rate Adaption Header", "gsm_a.dtap.rate_adaption_header", FT_BOOLEAN, 8, TFS(&tfs_included_not_included), 0x40, NULL, HFILL }},

2
epan/dissectors/packet-ieee80211.c
View File

@ -18259,7 +18259,7 @@ proto_register_ieee80211 (void)
{&hf_ieee80211_ampduparam_mpdu_start_spacing,
{"MPDU Density", "wlan_mgt.ht.ampduparam.mpdudensity",
FT_UINT8, BASE_HEX, VALS(&ampduparam_mpdu_start_spacing_flags), 0x1c,
FT_UINT8, BASE_HEX, VALS(ampduparam_mpdu_start_spacing_flags), 0x1c,
NULL, HFILL }},
{&hf_ieee80211_ampduparam_reserved,

4
epan/dissectors/packet-ifcp.c
View File

@ -591,10 +591,10 @@ proto_register_ifcp (void)
{ &hf_ifcp_encap_crc,
{"CRC", "ifcp.encap.crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}},
{ &hf_ifcp_sof,
{"SOF", "ifcp.sof", FT_UINT8, BASE_HEX, VALS (&ifcp_sof_vals), 0,
{"SOF", "ifcp.sof", FT_UINT8, BASE_HEX, VALS (ifcp_sof_vals), 0,
NULL, HFILL}},
{ &hf_ifcp_eof,
{"EOF", "ifcp.eof", FT_UINT8, BASE_HEX, VALS (&ifcp_eof_vals), 0,
{"EOF", "ifcp.eof", FT_UINT8, BASE_HEX, VALS (ifcp_eof_vals), 0,
NULL, HFILL}},
{ &hf_ifcp_sof_c,
{"SOF Compliment", "ifcp.sof_c", FT_UINT8, BASE_HEX, NULL , 0,

2
epan/dissectors/packet-ipmi-app.c
View File

@ -1328,7 +1328,7 @@ ipmi_register_app(gint proto_ipmi)
{ &hf_ipmi_app_38_rq_ipmi20,
{ "Version compatibility",
"ipmi.app38.rq_ipmi20", FT_UINT8, BASE_DEC, VALS(&vals_38_ipmi20), 0x80, NULL, HFILL }},
"ipmi.app38.rq_ipmi20", FT_UINT8, BASE_DEC, VALS(vals_38_ipmi20), 0x80, NULL, HFILL }},
{ &hf_ipmi_app_38_rq_chan,
{ "Channel",
"ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},

2
epan/dissectors/packet-lwm.c
View File

@ -747,7 +747,7 @@ void proto_register_lwm(void)
"It contains a destination network address from the frame that cannot be routed", HFILL }},
{ &hf_lwm_cmd_route_multi,
{ "Multicast", "lwm.cmd.multi", FT_UINT8, BASE_HEX, VALS(&lwm_cmd_multi_names), 0x0,
{ "Multicast", "lwm.cmd.multi", FT_UINT8, BASE_HEX, VALS(lwm_cmd_multi_names), 0x0,
"If it set to 0, Destination Address field contains a network address. If it set to 1, Destination Address field contains a group ID.", HFILL }},
/* Part of Command Frame - Route Request */

2
epan/dissectors/packet-mux27010.c
View File

@ -1113,7 +1113,7 @@ proto_register_mux27010 (void)
{&hf_mux27010_direction,
{ "Direction", "mux27010.direction",
FT_UINT8, BASE_HEX, VALS(&direction_vals), 0x0, NULL, HFILL }},
FT_UINT8, BASE_HEX, VALS(direction_vals), 0x0, NULL, HFILL }},
/*Flag*/

14
epan/dissectors/packet-netlink-sock_diag.c
View File

@ -181,7 +181,7 @@ static const value_string socket_type_vals[] = {
static header_field_info hfi_netlink_sock_diag_type NETLINK_SOCK_DIAG_HFI_INIT =
{ "Type", "netlink-sock_diag.type", FT_UINT8, BASE_DEC,
VALS(&socket_type_vals), 0x00, NULL, HFILL };
VALS(socket_type_vals), 0x00, NULL, HFILL };
static const value_string socket_state_vals[] = {
{ WS_ESTABLISHED, "ESTABLISHED" },
@ -200,7 +200,7 @@ static const value_string socket_state_vals[] = {
static header_field_info hfi_netlink_sock_diag_state NETLINK_SOCK_DIAG_HFI_INIT =
{ "State", "netlink-sock_diag.state", FT_UINT8, BASE_DEC,
VALS(&socket_state_vals), 0x00, NULL, HFILL };
VALS(socket_state_vals), 0x00, NULL, HFILL };
static header_field_info hfi_netlink_sock_diag_inode NETLINK_SOCK_DIAG_HFI_INIT =
{ "Inode", "netlink-sock_diag.inode", FT_UINT32, BASE_DEC,
@ -352,7 +352,7 @@ static const value_string netlink_sock_diag_unix_attr_vals[] = {
static header_field_info hfi_netlink_sock_diag_unix_attr NETLINK_SOCK_DIAG_HFI_INIT =
{ "Type", "netlink-sock_diag.unix_attr", FT_UINT16, BASE_DEC,
VALS(&netlink_sock_diag_unix_attr_vals), 0x00, NULL, HFILL };
VALS(netlink_sock_diag_unix_attr_vals), 0x00, NULL, HFILL };
static header_field_info hfi_netlink_sock_diag_unix_name NETLINK_SOCK_DIAG_HFI_INIT =
{ "Name", "netlink-sock_diag.unix_name", FT_STRINGZ, STR_ASCII,
@ -541,7 +541,7 @@ static const value_string netlink_sock_diag_inet_attr_vals[] = {
static header_field_info hfi_netlink_sock_diag_inet_attr NETLINK_SOCK_DIAG_HFI_INIT =
{ "Type", "netlink-sock_diag.inet_attr", FT_UINT16, BASE_DEC,
VALS(&netlink_sock_diag_inet_attr_vals), 0x00, NULL, HFILL };
VALS(netlink_sock_diag_inet_attr_vals), 0x00, NULL, HFILL };
static int
dissect_sock_diag_inet_attributes(tvbuff_t *tvb, void *data, proto_tree *tree, int nla_type, int offset, int len)
@ -745,7 +745,7 @@ static const value_string netlink_sock_diag_netlink_vals[] = {
static header_field_info hfi_netlink_sock_diag_netlink_attr NETLINK_SOCK_DIAG_HFI_INIT =
{ "Type", "netlink-sock_diag.netlink_attr", FT_UINT16, BASE_DEC,
VALS(&netlink_sock_diag_netlink_vals), 0x00, NULL, HFILL };
VALS(netlink_sock_diag_netlink_vals), 0x00, NULL, HFILL };
static int
dissect_sock_diag_netlink_attributes(tvbuff_t *tvb, void *data, proto_tree *tree, int nla_type, int offset, int len)
@ -920,13 +920,13 @@ static const value_string netlink_sock_diag_packet_vals[] = {
static header_field_info hfi_netlink_sock_diag_packet_attr NETLINK_SOCK_DIAG_HFI_INIT =
{ "Type", "netlink-sock_diag.netlink_attr", FT_UINT16, BASE_DEC,
VALS(&netlink_sock_diag_packet_vals), 0x00, NULL, HFILL };
VALS(netlink_sock_diag_packet_vals), 0x00, NULL, HFILL };
/* AF_PACKET */
static header_field_info hfi_netlink_sock_diag_packet_proto NETLINK_SOCK_DIAG_HFI_INIT =
{ "Protocol", "netlink-sock_diag.packet_protocol", FT_UINT16, BASE_HEX,
VALS(&etype_vals) /* XXX + Linux specific */, 0x00, NULL, HFILL };
VALS(etype_vals) /* XXX + Linux specific */, 0x00, NULL, HFILL };
static int
dissect_sock_diag_packet_reply(tvbuff_t *tvb, netlink_sock_diag_info_t *info, proto_tree *tree, int offset)

2
epan/dissectors/packet-ppi-vector.c
View File

@ -1322,7 +1322,7 @@ proto_register_ppi_vector(void)
/* V2 */
{ &hf_ppi_vector_vflags_relative_to,
{ "RelativeTo", "ppi_vector.vflags.relative_to", FT_UINT32, BASE_HEX, VALS(&relativeto_string), PPI_VECTOR_VFLAGS_RELATIVE_TO,
{ "RelativeTo", "ppi_vector.vflags.relative_to", FT_UINT32, BASE_HEX, VALS(relativeto_string), PPI_VECTOR_VFLAGS_RELATIVE_TO,
"Reference frame vectors are RelativeTo:", HFILL } },
/* Boolean vector chars */

10
epan/dissectors/packet-ppp.c
View File

@ -6301,10 +6301,10 @@ proto_register_ccp(void)
0x1F, "The size in bits of the largest code used", HFILL }},
{ &hf_ccp_opt_check_mode,
{ "Check Mode", "ccp.opt.check_mode", FT_UINT8, BASE_DEC,
VALS(&lzsdcp_checkmode_vals), 0x0, NULL, HFILL }},
VALS(lzsdcp_checkmode_vals), 0x0, NULL, HFILL }},
{ &hf_ccp_opt_process_mode,
{ "Process Mode", "ccp.opt.process_mode", FT_UINT8, BASE_DEC,
VALS(&lzsdcp_processmode_vals), 0x0, NULL, HFILL }},
VALS(lzsdcp_processmode_vals), 0x0, NULL, HFILL }},
{ &hf_ccp_opt_fe,
{ "Features", "ccp.opt.fe", FT_UINT8, BASE_DEC,
NULL, 0xC0, NULL, HFILL }},
@ -6319,19 +6319,19 @@ proto_register_ccp(void)
NULL, 0x0, NULL, HFILL }},
{ &hf_ccp_opt_mode,
{ "Mode", "ccp.opt.mode", FT_UINT8, BASE_DEC,
VALS(&dce_mode_vals), 0x0, NULL, HFILL }},
VALS(dce_mode_vals), 0x0, NULL, HFILL }},
{ &hf_ccp_opt_window,
{ "Window", "ccp.opt.window", FT_UINT8, BASE_DEC,
NULL, 0xF0, NULL, HFILL }},
{ &hf_ccp_opt_method,
{ "Method", "ccp.opt.method", FT_UINT8, BASE_DEC,
VALS(&deflate_method_vals), 0x0F, NULL, HFILL }},
VALS(deflate_method_vals), 0x0F, NULL, HFILL }},
{ &hf_ccp_opt_mbz,
{ "MBZ", "ccp.opt.mbz", FT_UINT8, BASE_DEC,
NULL, 0xFC, NULL, HFILL }},
{ &hf_ccp_opt_chk,
{ "Chk", "ccp.opt.chk", FT_UINT8, BASE_DEC,
VALS(&deflate_chk_vals), 0x03, NULL, HFILL }},
VALS(deflate_chk_vals), 0x03, NULL, HFILL }},
{ &hf_ccp_opt_mode_dictcount,
{ "Mode/Dictionary Count", "ccp.opt.mode_dictcount", FT_UINT16,
BASE_DEC | BASE_RANGE_STRING, RVALS(v44lzjh_mode_dict_rvals),

2
epan/dissectors/packet-wccp.c
View File

@ -3026,7 +3026,7 @@ proto_register_wccp(void)
},
{ &hf_web_cache_identity_flag_assign_type,
{ "Assignment Type", "wccp.web_cache_identity.flags.assign_type", FT_UINT16, BASE_HEX,
VALS(&wccp_web_cache_assignment_data_type_val), 0x6,
VALS(wccp_web_cache_assignment_data_type_val), 0x6,
NULL, HFILL }
},
{ &hf_web_cache_identity_flag_version_request,