Remove variadic macro that accidentally made it in a while back.

svn path=/trunk/; revision=44686

1 files changed, 259 insertions, 26 deletions

diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c
index a8b446214e..8b000e5718 100644
--- a/epan/dissectors/packet-llrp.c
+++ b/epan/dissectors/packet-llrp.c
@@ -39,27 +39,265 @@
 #define LLRP_PORT 5084
 
 /* Initialize the protocol and registered fields */
-static int proto_llrp                 = -1;
-static int hf_llrp_version            = -1;
-static int hf_llrp_type               = -1;
-static int hf_llrp_length             = -1;
-static int hf_llrp_id                 = -1;
-static int hf_llrp_cur_ver            = -1;
-static int hf_llrp_sup_ver            = -1;
-static int hf_llrp_req_cap            = -1;
-static int hf_llrp_req_conf           = -1;
-static int hf_llrp_rospec             = -1;
-static int hf_llrp_antenna_id         = -1;
-static int hf_llrp_gpi_port           = -1;
-static int hf_llrp_gpo_port           = -1;
-static int hf_llrp_rest_fact          = -1;
-static int hf_llrp_accessspec         = -1;
-static int hf_llrp_vendor             = -1;
-static int hf_llrp_impinj_msg_type    = -1;
-static int hf_llrp_tlv_type           = -1;
-static int hf_llrp_tv_type            = -1;
-static int hf_llrp_tlv_len            = -1;
-static int hf_llrp_param              = -1;
+static int proto_llrp                             = -1;
+static int hf_llrp_version                        = -1;
+static int hf_llrp_type                           = -1;
+static int hf_llrp_length                         = -1;
+static int hf_llrp_id                             = -1;
+static int hf_llrp_cur_ver                        = -1;
+static int hf_llrp_sup_ver                        = -1;
+static int hf_llrp_req_cap                        = -1;
+static int hf_llrp_req_conf                       = -1;
+static int hf_llrp_rospec                         = -1;
+static int hf_llrp_antenna_id                     = -1;
+static int hf_llrp_gpi_port                       = -1;
+static int hf_llrp_gpo_port                       = -1;
+static int hf_llrp_rest_fact                      = -1;
+static int hf_llrp_accessspec                     = -1;
+static int hf_llrp_vendor                         = -1;
+static int hf_llrp_impinj_msg_type                = -1;
+static int hf_llrp_tlv_type                       = -1;
+static int hf_llrp_tv_type                        = -1;
+static int hf_llrp_tlv_len                        = -1;
+static int hf_llrp_param                          = -1;
+static int hf_llrp_num_gpi                        = -1;
+static int hf_llrp_num_gpo                        = -1;
+static int hf_llrp_microseconds                   = -1;
+static int hf_llrp_max_supported_antenna          = -1;
+static int hf_llrp_can_set_antenna_prop           = -1;
+static int hf_llrp_has_utc_clock                  = -1;
+static int hf_llrp_device_manufacturer            = -1;
+static int hf_llrp_model                          = -1;
+static int hf_llrp_firmware_version               = -1;
+static int hf_llrp_max_receive_sense              = -1;
+static int hf_llrp_index                          = -1;
+static int hf_llrp_receive_sense                  = -1;
+static int hf_llrp_receive_sense_index_min        = -1;
+static int hf_llrp_receive_sense_index_max        = -1;
+static int hf_llrp_num_protocols                  = -1;
+static int hf_llrp_protocol_id                    = -1;
+static int hf_llrp_can_do_survey                  = -1;
+static int hf_llrp_can_report_buffer_warning      = -1;
+static int hf_llrp_support_client_opspec          = -1;
+static int hf_llrp_can_stateaware                 = -1;
+static int hf_llrp_support_holding                = -1;
+static int hf_llrp_max_priority_supported         = -1;
+static int hf_llrp_client_opspec_timeout          = -1;
+static int hf_llrp_max_num_rospec                 = -1;
+static int hf_llrp_max_num_spec_per_rospec        = -1;
+static int hf_llrp_max_num_inventory_per_aispec   = -1;
+static int hf_llrp_max_num_accessspec             = -1;
+static int hf_llrp_max_num_opspec_per_accressspec = -1;
+static int hf_llrp_country_code                   = -1;
+static int hf_llrp_comm_standard                  = -1;
+static int hf_llrp_transmit_power                 = -1;
+static int hf_llrp_hopping                        = -1;
+static int hf_llrp_hop_table_id                   = -1;
+static int hf_llrp_rfu                            = -1;
+static int hf_llrp_num_hops                       = -1;
+static int hf_llrp_frequency                      = -1;
+static int hf_llrp_num_freqs                      = -1;
+static int hf_llrp_min_freq                       = -1;
+static int hf_llrp_max_freq                       = -1;
+static int hf_llrp_rospec_id                      = -1;
+static int hf_llrp_priority                       = -1;
+static int hf_llrp_cur_state                      = -1;
+static int hf_llrp_rospec_start_trig_type         = -1;
+static int hf_llrp_offset                         = -1;
+static int hf_llrp_period                         = -1;
+static int hf_llrp_gpi_event                      = -1;
+static int hf_llrp_timeout                        = -1;
+static int hf_llrp_rospec_stop_trig_type          = -1;
+static int hf_llrp_duration_trig                  = -1;
+static int hf_llrp_antenna_count                  = -1;
+static int hf_llrp_antenna                        = -1;
+static int hf_llrp_aispec_stop_trig_type          = -1;
+static int hf_llrp_trig_type                      = -1;
+static int hf_llrp_number_of_tags                 = -1;
+static int hf_llrp_number_of_attempts             = -1;
+static int hf_llrp_t                              = -1;
+static int hf_llrp_inventory_spec_id              = -1;
+static int hf_llrp_start_freq                     = -1;
+static int hf_llrp_stop_freq                      = -1;
+static int hf_llrp_stop_trig_type                 = -1;
+static int hf_llrp_n_4                            = -1;
+static int hf_llrp_duration                       = -1;
+static int hf_llrp_accessspec_id                  = -1;
+static int hf_llrp_access_cur_state               = -1;
+static int hf_llrp_access_stop_trig_type          = -1;
+static int hf_llrp_operation_count                = -1;
+static int hf_llrp_opspec_id                      = -1;
+static int hf_llrp_conf_value                     = -1;
+static int hf_llrp_id_type                        = -1;
+static int hf_llrp_reader_id                      = -1;
+static int hf_llrp_gpo_data                       = -1;
+static int hf_llrp_keepalive_trig_type            = -1;
+static int hf_llrp_time_iterval                   = -1;
+static int hf_llrp_antenna_connected              = -1;
+static int hf_llrp_antenna_gain                   = -1;
+static int hf_llrp_receiver_sense                 = -1;
+static int hf_llrp_channel_idx                    = -1;
+static int hf_llrp_gpi_config                     = -1;
+static int hf_llrp_gpi_state                      = -1;
+static int hf_llrp_hold_events_and_reports        = -1;
+static int hf_llrp_ro_report_trig                 = -1;
+static int hf_llrp_n_2                            = -1;
+static int hf_llrp_enable_rospec_id               = -1;
+static int hf_llrp_enable_spec_idx                = -1;
+static int hf_llrp_enable_inv_spec_id             = -1;
+static int hf_llrp_enable_antenna_id              = -1;
+static int hf_llrp_enable_channel_idx             = -1;
+static int hf_llrp_enable_peak_rssi               = -1;
+static int hf_llrp_enable_first_seen              = -1;
+static int hf_llrp_enable_last_seen               = -1;
+static int hf_llrp_enable_seen_count              = -1;
+static int hf_llrp_enable_accessspec_id           = -1;
+static int hf_llrp_access_report_trig             = -1;
+static int hf_llrp_length_bits                    = -1;
+static int hf_llrp_epc                            = -1;
+static int hf_llrp_spec_idx                       = -1;
+static int hf_llrp_peak_rssi                      = -1;
+static int hf_llrp_tag_count                      = -1;
+static int hf_llrp_bandwidth                      = -1;
+static int hf_llrp_average_rssi                   = -1;
+static int hf_llrp_notif_state                    = -1;
+static int hf_llrp_event_type                     = -1;
+static int hf_llrp_next_chan_idx                  = -1;
+static int hf_llrp_roevent_type                   = -1;
+static int hf_llrp_prem_rospec_id                 = -1;
+static int hf_llrp_buffer_full_percentage         = -1;
+static int hf_llrp_message                        = -1;
+static int hf_llrp_rfevent_type                   = -1;
+static int hf_llrp_aievent_type                   = -1;
+static int hf_llrp_antenna_event_type             = -1;
+static int hf_llrp_conn_status                    = -1;
+static int hf_llrp_loop_count                     = -1;
+static int hf_llrp_status_code                    = -1;
+static int hf_llrp_error_desc                     = -1;
+static int hf_llrp_field_num                      = -1;
+static int hf_llrp_error_code                     = -1;
+static int hf_llrp_parameter_type                 = -1;
+static int hf_llrp_can_support_block_erase        = -1;
+static int hf_llrp_can_support_block_write        = -1;
+static int hf_llrp_can_support_block_permalock    = -1;
+static int hf_llrp_can_support_tag_recomm         = -1;
+static int hf_llrp_can_support_UMI_method2        = -1;
+static int hf_llrp_can_support_XPC                = -1;
+static int hf_llrp_max_num_filter_per_query       = -1;
+static int hf_llrp_mode_ident                     = -1;
+static int hf_llrp_DR                             = -1;
+static int hf_llrp_hag_conformance                = -1;
+static int hf_llrp_mod                            = -1;
+static int hf_llrp_flm                            = -1;
+static int hf_llrp_m                              = -1;
+static int hf_llrp_bdr                            = -1;
+static int hf_llrp_pie                            = -1;
+static int hf_llrp_min_tari                       = -1;
+static int hf_llrp_max_tari                       = -1;
+static int hf_llrp_step_tari                      = -1;
+static int hf_llrp_inventory_state_aware          = -1;
+static int hf_llrp_trunc                          = -1;
+static int hf_llrp_mb                             = -1;
+static int hf_llrp_pointer                        = -1;
+static int hf_llrp_tag_mask                       = -1;
+static int hf_llrp_aware_filter_target            = -1;
+static int hf_llrp_aware_filter_action            = -1;
+static int hf_llrp_unaware_filter_action          = -1;
+static int hf_llrp_mode_idx                       = -1;
+static int hf_llrp_tari                           = -1;
+static int hf_llrp_session                        = -1;
+static int hf_llrp_tag_population                 = -1;
+static int hf_llrp_tag_transit_time               = -1;
+static int hf_llrp_sing_i                         = -1;
+static int hf_llrp_sing_s                         = -1;
+static int hf_llrp_sing_a                         = -1;
+static int hf_llrp_match                          = -1;
+static int hf_llrp_tag_data                       = -1;
+static int hf_llrp_access_pass                    = -1;
+static int hf_llrp_word_pointer                   = -1;
+static int hf_llrp_word_count                     = -1;
+static int hf_llrp_write_data                     = -1;
+static int hf_llrp_kill_pass                      = -1;
+static int hf_llrp_kill_3                         = -1;
+static int hf_llrp_kill_2                         = -1;
+static int hf_llrp_kill_l                         = -1;
+static int hf_llrp_privilege                      = -1;
+static int hf_llrp_data_field                     = -1;
+static int hf_llrp_block_pointer                  = -1;
+static int hf_llrp_block_mask                     = -1;
+static int hf_llrp_length_words                   = -1;
+static int hf_llrp_block_range                    = -1;
+static int hf_llrp_enable_crc                     = -1;
+static int hf_llrp_enable_pc                      = -1;
+static int hf_llrp_enable_xpc                     = -1;
+static int hf_llrp_pc_bits                        = -1;
+static int hf_llrp_xpc_w1                         = -1;
+static int hf_llrp_xpc_w2                         = -1;
+static int hf_llrp_crc                            = -1;
+static int hf_llrp_num_coll                       = -1;
+static int hf_llrp_num_empty                      = -1;
+static int hf_llrp_access_result                  = -1;
+static int hf_llrp_read_data                      = -1;
+static int hf_llrp_num_words_written              = -1;
+static int hf_llrp_permlock_status                = -1;
+static int hf_llrp_vendor_id                      = -1;
+static int hf_llrp_impinj_param_type              = -1;
+static int hf_llrp_save_config                    = -1;
+static int hf_llrp_impinj_req_data                = -1;
+static int hf_llrp_impinj_reg_region              = -1;
+static int hf_llrp_impinj_search_mode             = -1;
+static int hf_llrp_impinj_en_tag_dir              = -1;
+static int hf_llrp_impinj_antenna_conf            = -1;
+static int hf_llrp_decision_time                  = -1;
+static int hf_llrp_impinj_tag_dir                 = -1;
+static int hf_llrp_confidence                     = -1;
+static int hf_llrp_impinj_fix_freq_mode           = -1;
+static int hf_llrp_num_channels                   = -1;
+static int hf_llrp_channel                        = -1;
+static int hf_llrp_impinj_reduce_power_mode       = -1;
+static int hf_llrp_impinj_low_duty_mode           = -1;
+static int hf_llrp_empty_field_timeout            = -1;
+static int hf_llrp_field_ping_interval            = -1;
+static int hf_llrp_model_name                     = -1;
+static int hf_llrp_serial_number                  = -1;
+static int hf_llrp_soft_ver                       = -1;
+static int hf_llrp_firm_ver                       = -1;
+static int hf_llrp_fpga_ver                       = -1;
+static int hf_llrp_pcba_ver                       = -1;
+static int hf_llrp_height_thresh                  = -1;
+static int hf_llrp_zero_motion_thresh             = -1;
+static int hf_llrp_board_manufacturer             = -1;
+static int hf_llrp_fw_ver_hex                     = -1;
+static int hf_llrp_hw_ver_hex                     = -1;
+static int hf_llrp_gpi_debounce                   = -1;
+static int hf_llrp_temperature                    = -1;
+static int hf_llrp_impinj_link_monitor_mode       = -1;
+static int hf_llrp_link_down_thresh               = -1;
+static int hf_llrp_impinj_report_buff_mode        = -1;
+static int hf_llrp_permalock_result               = -1;
+static int hf_llrp_block_permalock_result         = -1;
+static int hf_llrp_impinj_data_profile            = -1;
+static int hf_llrp_impinj_access_range            = -1;
+static int hf_llrp_impinj_persistence             = -1;
+static int hf_llrp_set_qt_config_result           = -1;
+static int hf_llrp_get_qt_config_result           = -1;
+static int hf_llrp_impinj_serialized_tid_mode     = -1;
+static int hf_llrp_impinj_rf_phase_mode           = -1;
+static int hf_llrp_impinj_peak_rssi_mode          = -1;
+static int hf_llrp_impinj_gps_coordinates_mode    = -1;
+static int hf_llrp_impinj_tid                     = -1;
+static int hf_llrp_phase_angle                    = -1;
+static int hf_llrp_rssi                           = -1;
+static int hf_llrp_latitude                       = -1;
+static int hf_llrp_longitude                      = -1;
+static int hf_llrp_gga_sentence                   = -1;
+static int hf_llrp_rmc_sentence                   = -1;
+static int hf_llrp_impinj_optim_read_mode         = -1;
+static int hf_llrp_impinj_rf_doppler_mode         = -1;
+static int hf_llrp_retry_count                    = -1;
+static int hf_llrp_impinj_access_spec_ordering    = -1;
+static int hf_llrp_impinj_gpo_mode                = -1;
+static int hf_llrp_gpo_pulse_dur                  = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_llrp = -1;
@@ -1379,11 +1617,6 @@ static value_string_ext impinj_gpo_mode_ext = VALUE_STRING_EXT_INIT(impinj_gpo_m
     HF_PARAM(impinj_gpo_mode, "GPO mode", FT_UINT16, BASE_DEC | BASE_EXT_STRING, &impinj_gpo_mode_ext, 0) \
     HF_PARAM(gpo_pulse_dur, "GPO pulse duration", FT_UINT32, BASE_DEC, NULL, 0) \
 
-/* Construct the hfindex variables */
-#define HF_PARAM(name, ...) static int hf_llrp_##name = -1;
-HF_LLRP_PARAMETER_LIST
-#undef HF_PARAM
-
 static guint
 dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         guint offset, const guint end);