netlink-*: fix various VALS/TFS misuse

No functional change, this just updates the annotations.

Change-Id: I5517a6fd65452db128cdaaa6a90df8c578b5e8d0
Reviewed-on: https://code.wireshark.org/review/29753
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/epan/dissectors/packet-netlink-nl80211.c b/epan/dissectors/packet-netlink-nl80211.c
index 550485bb9658bf70fcb65368cd76b5777bbac20f..7a8d52ed3890e1a32d1d04c1086c385864b2aca9 100644 (file)
--- a/epan/dissectors/packet-netlink-nl80211.c
+++ b/epan/dissectors/packet-netlink-nl80211.c
@@ -2154,247 +2154,247 @@ static value_string_ext ws_nl80211_external_auth_action_vals_ext = VALUE_STRING_
 
 static header_field_info hfi_nl80211_commands NETLINK_NL80211_HFI_INIT =
     { "Command", "nl80211.cmd", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_commands_vals_ext), 0x00, "Generic Netlink Command", HFILL };
+      VALS_EXT_PTR(&ws_nl80211_commands_vals_ext), 0x00, "Generic Netlink Command", HFILL };
 
 static header_field_info hfi_nl80211_attrs NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.attr_type", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_attrs_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_attrs_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_iftype NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.iftype", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_iftype_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_iftype_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sta_flags NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.sta_flags", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sta_flags_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sta_flags_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sta_p2p_ps_status NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.sta_p2p_ps_status", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sta_p2p_ps_status_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sta_p2p_ps_status_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_rate_info NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.rate_info", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_rate_info_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_rate_info_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sta_bss_param NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.sta_bss_param", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sta_bss_param_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sta_bss_param_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sta_info NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.sta_info", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sta_info_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sta_info_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_tid_stats NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.tid_stats", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_tid_stats_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_tid_stats_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_txq_stats NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.txq_stats", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_txq_stats_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_txq_stats_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_mpath_info NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.mpath_info", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_mpath_info_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_mpath_info_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_band_iftype_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.band_iftype_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_band_iftype_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_band_iftype_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_band_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.band_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_band_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_band_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_wmm_rule NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.wmm_rule", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_wmm_rule_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_wmm_rule_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_frequency_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.frequency_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_frequency_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_frequency_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_bitrate_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.bitrate_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_bitrate_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_bitrate_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_reg_initiator NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.reg_initiator", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_reg_initiator_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_reg_initiator_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_reg_type NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.reg_type", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_reg_type_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_reg_type_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_reg_rule_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.reg_rule_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_reg_rule_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_reg_rule_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sched_scan_match_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.sched_scan_match_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sched_scan_match_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sched_scan_match_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_dfs_regions NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.dfs_regions", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_dfs_regions_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_dfs_regions_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_user_reg_hint_type NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.user_reg_hint_type", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_user_reg_hint_type_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_user_reg_hint_type_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_survey_info NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.survey_info", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_survey_info_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_survey_info_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_mntr_flags NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.mntr_flags", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_mntr_flags_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_mntr_flags_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_mesh_power_mode NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.mesh_power_mode", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_mesh_power_mode_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_mesh_power_mode_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_meshconf_params NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.meshconf_params", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_meshconf_params_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_meshconf_params_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_mesh_setup_params NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.mesh_setup_params", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_mesh_setup_params_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_mesh_setup_params_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_txq_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.txq_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_txq_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_txq_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_channel_type NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.channel_type", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_channel_type_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_channel_type_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_chan_width NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.chan_width", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_chan_width_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_chan_width_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_bss_scan_width NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.bss_scan_width", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_bss_scan_width_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_bss_scan_width_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_bss NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.bss", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_bss_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_bss_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_bss_status NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.bss_status", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_bss_status_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_bss_status_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_auth_type NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.auth_type", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_auth_type_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_auth_type_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_key_type NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.key_type", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_key_type_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_key_type_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_mfp NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.mfp", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_mfp_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_mfp_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_key_default_types NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.key_default_types", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_key_default_types_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_key_default_types_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_key_attributes NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.key_attributes", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_key_attributes_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_key_attributes_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_tx_rate_attributes NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.tx_rate_attributes", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_tx_rate_attributes_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_tx_rate_attributes_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_ps_state NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.ps_state", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_ps_state_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_ps_state_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_attr_cqm NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.attr_cqm", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_attr_cqm_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_attr_cqm_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_tx_power_setting NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.tx_power_setting", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_tx_power_setting_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_tx_power_setting_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_if_combination_attrs NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.if_combination_attrs", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_if_combination_attrs_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_if_combination_attrs_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_plink_state NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.plink_state", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_plink_state_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_plink_state_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_plink_actions NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.plink_actions", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_plink_actions_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_plink_actions_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_rekey_data NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.rekey_data", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_rekey_data_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_rekey_data_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sta_wme_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.sta_wme_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sta_wme_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sta_wme_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_pmksa_candidate_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.pmksa_candidate_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_pmksa_candidate_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_pmksa_candidate_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_tdls_operation NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.tdls_operation", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_tdls_operation_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_tdls_operation_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_connect_failed_reason NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.connect_failed_reason", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_connect_failed_reason_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_connect_failed_reason_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_timeout_reason NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.timeout_reason", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_timeout_reason_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_timeout_reason_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_acl_policy NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.acl_policy", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_acl_policy_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_acl_policy_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_smps_mode NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.smps_mode", FT_UINT8, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_smps_mode_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_smps_mode_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_radar_event NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.radar_event", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_radar_event_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_radar_event_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_dfs_state NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.dfs_state", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_dfs_state_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_dfs_state_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_crit_proto_id NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.crit_proto_id", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_crit_proto_id_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_crit_proto_id_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_sched_scan_plan NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.sched_scan_plan", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_sched_scan_plan_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_sched_scan_plan_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_bss_select_attr NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.bss_select_attr", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_bss_select_attr_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_bss_select_attr_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_nan_func_attributes NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.an_func_attributes", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_nan_func_attributes_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_nan_func_attributes_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_nan_match_attributes NETLINK_NL80211_HFI_INIT =
     { "Attribute Type", "nl80211.an_match_attributes", FT_UINT16, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_nan_match_attributes_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_nan_match_attributes_vals_ext), 0x00, NULL, HFILL };
 
 static header_field_info hfi_nl80211_external_auth_action NETLINK_NL80211_HFI_INIT =
     { "Attribute Value", "nl80211.external_auth_action", FT_UINT32, BASE_DEC | BASE_EXT_STRING,
-      VALS(&ws_nl80211_external_auth_action_vals_ext), 0x00, NULL, HFILL };
+      VALS_EXT_PTR(&ws_nl80211_external_auth_action_vals_ext), 0x00, NULL, HFILL };
 
 static gint ett_nl80211_commands = -1;
 static gint ett_nl80211_attrs = -1;

diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c
index d9f7e8c241058fd9fd3f1f886f15655224b7c440..c7cfbb4990b5e4bbd70908491d8cba125c204ffd 100644 (file)
--- a/epan/dissectors/packet-netlink-route.c
+++ b/epan/dissectors/packet-netlink-route.c
@@ -396,11 +396,11 @@ static header_field_info hfi_netlink_route_ifi_flags NETLINK_ROUTE_HFI_INIT =
 
 static header_field_info hfi_netlink_route_ifi_flags_iff_up NETLINK_ROUTE_HFI_INIT =
        { "Interface", "netlink-route.ifi_flags.iff_up", FT_BOOLEAN, 32,
-         &tfs_up_down, WS_IFF_UP, NULL, HFILL };
+         TFS(&tfs_up_down), WS_IFF_UP, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifi_flags_iff_broadcast NETLINK_ROUTE_HFI_INIT =
        { "Broadcast", "netlink-route.ifi_flags.iff_broadcast", FT_BOOLEAN, 32,
-         &tfs_valid_invalid, WS_IFF_BROADCAST, NULL, HFILL };
+         TFS(&tfs_valid_invalid), WS_IFF_BROADCAST, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifi_change NETLINK_ROUTE_HFI_INIT =
        { "Device change flags", "netlink-route.ifi_change", FT_UINT32, BASE_DEC,
@@ -551,7 +551,7 @@ static header_field_info hfi_netlink_route_ifla_gso_maxsegs NETLINK_ROUTE_HFI_IN
 
 static header_field_info hfi_netlink_route_ifla_carrier NETLINK_ROUTE_HFI_INIT =
        { "Carrier", "netlink-route.ifla_carrier", FT_BOOLEAN, 32,
-         &tfs_restricted_not_restricted, 0x00, NULL, HFILL };
+         TFS(&tfs_restricted_not_restricted), 0x00, NULL, HFILL };
 
 static header_field_info hfi_netlink_route_ifla_qdisc NETLINK_ROUTE_HFI_INIT =
        { "Queueing discipline", "netlink-route.ifla_qdisc", FT_STRINGZ, STR_ASCII,

diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c
index a3f223a1b0003fb1b983b8e05f4827787586fced..1c7d94e1dcdedf735fcd73c029b86eaba1c38c10 100644 (file)
--- a/epan/dissectors/packet-netlink-sock_diag.c
+++ b/epan/dissectors/packet-netlink-sock_diag.c
@@ -454,27 +454,27 @@ static header_field_info hfi_netlink_sock_diag_unix_show NETLINK_SOCK_DIAG_HFI_I
 
 static header_field_info hfi_netlink_sock_diag_unix_show_name NETLINK_SOCK_DIAG_HFI_INIT =
        { "Name", "netlink-sock_diag.unix_show.name", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_UDIAG_SHOW_NAME, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_UDIAG_SHOW_NAME, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_show_vfs NETLINK_SOCK_DIAG_HFI_INIT =
        { "VFS inode info", "netlink-sock_diag.unix_show.vfs", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_UDIAG_SHOW_VFS, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_UDIAG_SHOW_VFS, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_show_peer NETLINK_SOCK_DIAG_HFI_INIT =
        { "Peer socket info", "netlink-sock_diag.unix_show.peer", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_UDIAG_SHOW_PEER, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_UDIAG_SHOW_PEER, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_show_icons NETLINK_SOCK_DIAG_HFI_INIT =
        { "Pending connections", "netlink-sock_diag.unix_show.icons", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_UDIAG_SHOW_ICONS, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_UDIAG_SHOW_ICONS, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_show_rqlen NETLINK_SOCK_DIAG_HFI_INIT =
        { "skb receive queue len", "netlink-sock_diag.unix_show.rqlen", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_UDIAG_SHOW_RQLEN, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_UDIAG_SHOW_RQLEN, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_unix_show_meminfo NETLINK_SOCK_DIAG_HFI_INIT =
        { "Memory info of a socket", "netlink-sock_diag.unix_show.rqlen", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_UDIAG_SHOW_MEMINFO, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_UDIAG_SHOW_MEMINFO, NULL, HFILL };
 
 static int
 dissect_sock_diag_unix_request_show(tvbuff_t *tvb, netlink_sock_diag_info_t *info, proto_tree *tree, int offset)
@@ -843,15 +843,15 @@ static header_field_info hfi_netlink_sock_diag_netlink_show NETLINK_SOCK_DIAG_HF
 
 static header_field_info hfi_netlink_sock_diag_netlink_show_meminfo NETLINK_SOCK_DIAG_HFI_INIT =
        { "Memory info of a socket", "netlink-sock_diag.netlink_show.meminfo", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_NDIAG_SHOW_MEMINFO, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_NDIAG_SHOW_MEMINFO, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_netlink_show_groups NETLINK_SOCK_DIAG_HFI_INIT =
        { "Groups of a netlink socket", "netlink-sock_diag.netlink_show.groups", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_NDIAG_SHOW_GROUPS, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_NDIAG_SHOW_GROUPS, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_netlink_show_ring_cfg NETLINK_SOCK_DIAG_HFI_INIT =
        { "Ring configuration", "netlink-sock_diag.netlink_show.ring_cfg", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_NDIAG_SHOW_RING_CFG, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_NDIAG_SHOW_RING_CFG, NULL, HFILL };
 
 static int
 dissect_sock_diag_netlink_request_show(tvbuff_t *tvb, netlink_sock_diag_info_t *info, proto_tree *tree, int offset)
@@ -971,27 +971,27 @@ static header_field_info hfi_netlink_sock_diag_packet_show NETLINK_SOCK_DIAG_HFI
 
 static header_field_info hfi_netlink_sock_diag_packet_show_info NETLINK_SOCK_DIAG_HFI_INIT =
        { "Basic packet_sk information", "netlink-sock_diag.packet_show.info", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_PACKET_SHOW_INFO, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_PACKET_SHOW_INFO, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_packet_show_mclist NETLINK_SOCK_DIAG_HFI_INIT =
        { "Set of packet_diag_mclist-s", "netlink-sock_diag.packet_show.mclist", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_PACKET_SHOW_MCLIST, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_PACKET_SHOW_MCLIST, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_packet_show_ring_cfg NETLINK_SOCK_DIAG_HFI_INIT =
        { "Rings configuration parameters", "netlink-sock_diag.packet_show.ring_cfg", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_PACKET_SHOW_RING_CFG, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_PACKET_SHOW_RING_CFG, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_packet_show_fanout NETLINK_SOCK_DIAG_HFI_INIT =
        { "Fanout", "netlink-sock_diag.packet_show.fanout", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_PACKET_SHOW_FANOUT, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_PACKET_SHOW_FANOUT, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_packet_show_meminfo NETLINK_SOCK_DIAG_HFI_INIT =
        { "memory info", "netlink-sock_diag.packet_show.meminfo", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_PACKET_SHOW_MEMINFO, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_PACKET_SHOW_MEMINFO, NULL, HFILL };
 
 static header_field_info hfi_netlink_sock_diag_packet_show_filter NETLINK_SOCK_DIAG_HFI_INIT =
        { "Filter", "netlink-sock_diag.packet_show.filter", FT_BOOLEAN, 32,
-         &_tfs_show_do_not_show, WS_PACKET_SHOW_FILTER, NULL, HFILL };
+         TFS(&_tfs_show_do_not_show), WS_PACKET_SHOW_FILTER, NULL, HFILL };
 
 static int
 dissect_sock_diag_packet_request_show(tvbuff_t *tvb, netlink_sock_diag_info_t *info, proto_tree *tree, int offset)