From c840cdd5a07a65b3903e443f1ed1203e60c5eba6 Mon Sep 17 00:00:00 2001 From: Gerasimos Dimitriadis Date: Tue, 17 Nov 2009 18:35:27 +0000 Subject: Remove the address operator from value_string arrays fed to VALS() svn path=/trunk/; revision=30995 --- plugins/ethercat/packet-ethercat-datagram.c | 6 +++--- plugins/ethercat/packet-ethercat-frame.c | 2 +- plugins/irda/packet-irda.c | 2 +- plugins/wimax/msg_prc_lt_ctrl.c | 2 +- plugins/wimax/wimax_utils.c | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins') 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, -- cgit v1.2.3