Fix RVALS() macro usage

svn path=/trunk/; revision=42720

9 files changed, 43 insertions, 43 deletions

diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index f1ca1e293d..30e9404cde 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -16547,7 +16547,7 @@ void proto_register_ansi_map(void) {
             NULL, HFILL }},
         { &hf_ansi_map_cdmaserviceoption,
           { "CDMAServiceOption", "ansi_map.cdmaserviceoption",
-            FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(&cdmaserviceoption_vals), 0x0,
+            FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(cdmaserviceoption_vals), 0x0,
             NULL, HFILL }},
         { &hf_ansi_trans_cap_waddr,
           { "WIN Addressing (WADDR)", "ansi_map.trans_cap_waddr",
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 0fea540084..649e8ba53c 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -19960,7 +19960,7 @@ void proto_register_gsm_map(void) {
           NULL, HFILL }},
       { &hf_gsm_map_locationnumber_nai,
         { "Nature of address indicator", "gsm_map.locationnumber.nai",
-          FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&gsm_map_na_vals), 0x3f,
+          FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(gsm_map_na_vals), 0x3f,
           NULL, HFILL }},
       { &hf_gsm_map_locationnumber_inn,
         { "Internal Network Number indicator (INN)", "gsm_map.locationnumber.inn",
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index c99c09fe58..e3947b12d4 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -4990,11 +4990,11 @@ proto_register_isakmp(void)
         "ISAKMP Responder Cookie", HFILL }},
     { &hf_isakmp_typepayload,
       { "Type Payload", "isakmp.typepayload",
-        FT_UINT8,BASE_RANGE_STRING | BASE_DEC, RVALS(&payload_type), 0x0,
+        FT_UINT8,BASE_RANGE_STRING | BASE_DEC, RVALS(payload_type), 0x0,
         "ISAKMP Type Payload", HFILL }},
     { &hf_isakmp_nextpayload,
       { "Next payload", "isakmp.nextpayload",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&payload_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(payload_type), 0x0,
         "ISAKMP Next Payload", HFILL }},
     { &hf_isakmp_criticalpayload,
       { "Critical Bit", "isakmp.criticalpayload",
@@ -5114,11 +5114,11 @@ proto_register_isakmp(void)
         "ISAKMP Transform ID", HFILL }},
     { &hf_isakmp_id_type_v1,
       { "ID type", "isakmp.id.type",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&vs_v1_id_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(vs_v1_id_type), 0x0,
         "ISAKMP (v1) ID Type", HFILL }},
     { &hf_isakmp_id_type_v2,
       { "ID type", "isakmp.id.type",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&vs_v2_id_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(vs_v2_id_type), 0x0,
         "ISAKMP (v2) ID Type", HFILL }},
     { &hf_isakmp_id_protoid,
       { "Protocol ID", "isakmp.id.protoid",
@@ -5182,11 +5182,11 @@ proto_register_isakmp(void)
         NULL, HFILL } },
     { &hf_isakmp_cert_encoding_v1,
       { "Certificate Encoding", "isakmp.cert.encoding",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&cert_v1_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(cert_v1_type), 0x0,
         "ISAKMP Certificate Encoding", HFILL }},
     { &hf_isakmp_cert_encoding_v2,
       { "Certificate Encoding", "isakmp.cert.encoding",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&cert_v2_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(cert_v2_type), 0x0,
         "IKEv2 Certificate Encoding", HFILL }},
     { &hf_isakmp_cert_data,
       { "Certificate Data", "isakmp.cert.data",
@@ -5194,15 +5194,15 @@ proto_register_isakmp(void)
         "ISAKMP Certificate Data", HFILL }},
     { &hf_isakmp_certreq_type_v1,
       { "Certificate Type", "isakmp.certreq.type",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&cert_v1_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(cert_v1_type), 0x0,
         "ISAKMP Certificate Type", HFILL }},
     { &hf_isakmp_certreq_type_v2,
       { "Certificate Type", "isakmp.certreq.type",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&cert_v2_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(cert_v2_type), 0x0,
         "IKEv2 Certificate Type", HFILL }},
     { &hf_isakmp_auth_meth,
       { "Authentication Method", "isakmp.auth.method",
-        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&authmeth_v2_type), 0x0,
+        FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(authmeth_v2_type), 0x0,
         "IKEv2 Authentication Method", HFILL }},
     { &hf_isakmp_auth_data,
       { "Authentication Data", "isakmp.auth.data",
@@ -5851,7 +5851,7 @@ proto_register_isakmp(void)
 
     { &hf_isakmp_cfg_type_v1,
       { "Type", "isakmp.cfg.type",
-         FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&vs_v1_cfgtype), 0x0,
+         FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(vs_v1_cfgtype), 0x0,
          "ISAKMP (v1) Config Type", HFILL }},
     { &hf_isakmp_cfg_identifier,
       { "Identifier", "isakmp.cfg.identifier",
@@ -5859,7 +5859,7 @@ proto_register_isakmp(void)
          "ISAKMP (v1) Config Identifier", HFILL }},
     { &hf_isakmp_cfg_type_v2,
       { "Type", "isakmp.cfg.type",
-         FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(&vs_v2_cfgtype), 0x0,
+         FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(vs_v2_cfgtype), 0x0,
          "ISAKMP (v2) Config Type", HFILL }},
 	/* Config Attributes Type */
    { &hf_isakmp_cfg_attr,
@@ -5868,11 +5868,11 @@ proto_register_isakmp(void)
 	"ISAKMP Config Attribute", HFILL }},
    { &hf_isakmp_cfg_attr_type_v1,
       { "Type",	"isakmp.cfg.attr.type",
-	FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(&vs_v1_cfgattr), 0x00,
+	FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(vs_v1_cfgattr), 0x00,
 	"ISAKMP (v1) Config Attribute type", HFILL }},
    { &hf_isakmp_cfg_attr_type_v2,
       { "Type",	"isakmp.cfg.attr.type",
-	FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(&vs_v2_cfgattr), 0x00,
+	FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(vs_v2_cfgattr), 0x00,
 	"ISAKMP (v2) Config Attribute type", HFILL }},
    { &hf_isakmp_cfg_attr_format,
       { "Config Attribute Format",	"isakmp.cfg.attr.format",
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 2c37bf10ea..749f96496e 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -2359,7 +2359,7 @@ proto_register_lmp(void)
 		  FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 	   {&hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
 		{ "Encoding Type", "lmp.begin_verify.enctype",
-		  FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(&gmpls_lsp_enc_rvals), 0x0,
+		  FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(gmpls_lsp_enc_rvals), 0x0,
 			NULL, HFILL }},
 	   {&hf_lmp_filter[LMPF_VAL_VERIFY_ID],
 		{ "Verify-ID", "lmp.verifyid", FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -2413,10 +2413,10 @@ proto_register_lmp(void)
 			NULL, HFILL }},
 	   {&hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
 		{ "Interface Switching Capability", "lmp.data_link_switching", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
-		  RVALS(&gmpls_switching_type_rvals), 0x0, NULL, HFILL }},
+		  RVALS(gmpls_switching_type_rvals), 0x0, NULL, HFILL }},
 	   {&hf_lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
 		{ "LSP Encoding Type", "lmp.data_link_encoding", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
-		  RVALS(&gmpls_lsp_enc_rvals), 0x0, NULL, HFILL }},
+		  RVALS(gmpls_lsp_enc_rvals), 0x0, NULL, HFILL }},
 
 	   {&hf_lmp_filter[LMPF_VAL_ERROR],
 		{ "Error Code", "lmp.error", FT_UINT32, BASE_HEX, NULL, 0x0,
@@ -2675,10 +2675,10 @@ proto_register_lmp(void)
 			NULL, HFILL }},
 	   {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SWITCHING_TYPE],
 		{ "Interface Switching Capability", "lmp.lad_switching", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
-		  RVALS(&gmpls_switching_type_rvals), 0x0, NULL, HFILL }},
+		  RVALS(gmpls_switching_type_rvals), 0x0, NULL, HFILL }},
 	   {&hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_LSP_ENCODING],
 		{ "LSP Encoding Type", "lmp.lad_encoding", FT_UINT8, BASE_DEC|BASE_RANGE_STRING,
-		  RVALS(&gmpls_lsp_enc_rvals), 0x0, NULL, HFILL }},
+		  RVALS(gmpls_lsp_enc_rvals), 0x0, NULL, HFILL }},
 	};
 
     for (i=0; i<NUM_LMP_SUBTREES; i++) {
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index bd08e99555..159fa11102 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -902,7 +902,7 @@ proto_register_mp4ves(void)
 		},
 		{ &hf_mp4ves_start_code,
 		  { "Start code",		"mp4ves.start_code",
-		    FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&mp4ves_startcode_vals), 0x0,
+		    FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(mp4ves_startcode_vals), 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_vop_coding_type,
diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c
index 217becdc8d..ce231cea7a 100644
--- a/epan/dissectors/packet-mpls-pm.c
+++ b/epan/dissectors/packet-mpls-pm.c
@@ -901,7 +901,7 @@ proto_register_mpls_pm(void)
                 "Control Code",
                 "mpls.pm.ctrl.code",
                 FT_UINT8, BASE_RANGE_STRING | BASE_HEX,
-                RVALS(&mpls_pm_query_ctrl_code_rvals), 0x0,
+                RVALS(mpls_pm_query_ctrl_code_rvals), 0x0,
                 "Code identifying the query type", HFILL
             }
         },
@@ -911,7 +911,7 @@ proto_register_mpls_pm(void)
                 "Control Code",
                 "mpls.pm.ctrl.code",
                 FT_UINT8, BASE_RANGE_STRING | BASE_HEX,
-                RVALS(&mpls_pm_response_ctrl_code_rvals), 0x0,
+                RVALS(mpls_pm_response_ctrl_code_rvals), 0x0,
                 "Code identifying the response type", HFILL
             }
         },
@@ -963,7 +963,7 @@ proto_register_mpls_pm(void)
                 "Origin Timestamp Format (OTF)",
                 "mpls.pm.otf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0x0F,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0x0F,
                 NULL, HFILL
             }
         },
@@ -1083,7 +1083,7 @@ proto_register_mpls_pm(void)
                 "Querier timestamp format (QTF)",
                 "mpls.pm.qtf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0xF0,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0xF0,
                 NULL, HFILL
             }
         },
@@ -1093,7 +1093,7 @@ proto_register_mpls_pm(void)
                 "Querier timestamp format (QTF)",
                 "mpls.pm.qtf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0x0F,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0x0F,
                 NULL, HFILL
             }
         },
@@ -1103,7 +1103,7 @@ proto_register_mpls_pm(void)
                 "Responder timestamp format (RTF)",
                 "mpls.pm.rtf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0x0F,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0x0F,
                 NULL, HFILL
             }
         },
@@ -1113,7 +1113,7 @@ proto_register_mpls_pm(void)
                 "Responder timestamp format (RTF)",
                 "mpls.pm.rtf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0xF0,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0xF0,
                 NULL, HFILL
             }
         },
@@ -1123,7 +1123,7 @@ proto_register_mpls_pm(void)
                 "Responder's preferred timestamp format (RPTF)",
                 "mpls.pm.rptf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0xF0,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0xF0,
                 NULL, HFILL
             }
         },
@@ -1133,7 +1133,7 @@ proto_register_mpls_pm(void)
                 "Responder's preferred timestamp format (RPTF)",
                 "mpls.pm.rptf",
                 FT_UINT8, BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_pm_time_stamp_format_rvals), 0x0F,
+                RVALS(mpls_pm_time_stamp_format_rvals), 0x0F,
                 NULL, HFILL
             }
         },
diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c
index 10ac0f16b1..39a0cc327f 100644
--- a/epan/dissectors/packet-mpls-psc.c
+++ b/epan/dissectors/packet-mpls-psc.c
@@ -184,7 +184,7 @@ proto_register_mpls_psc(void)
             {
                 "Request", "mpls.psc.req", FT_UINT8,
                 BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_psc_req_rvals),
+                RVALS(mpls_psc_req_rvals),
                 0x3C, NULL, HFILL
             }
         },
@@ -193,7 +193,7 @@ proto_register_mpls_psc(void)
             {
                 "Protection Type", "mpls.psc.pt", FT_UINT8,
                 BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_psc_pt_rvals),
+                RVALS(mpls_psc_pt_rvals),
                 0x03, NULL, HFILL
             }
         },
@@ -202,7 +202,7 @@ proto_register_mpls_psc(void)
             {
                 "R", "mpls.psc.rev", FT_UINT8,
                 BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_psc_rev_rvals),
+                RVALS(mpls_psc_rev_rvals),
                 0x80, NULL, HFILL
             }
         },
@@ -211,7 +211,7 @@ proto_register_mpls_psc(void)
             {
                 "Fault Path", "mpls.psc.fpath", FT_UINT8,
                 BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_psc_fpath_rvals),
+                RVALS(mpls_psc_fpath_rvals),
                 0x0, NULL, HFILL
             }
         },
@@ -220,7 +220,7 @@ proto_register_mpls_psc(void)
             {
                 "Data Path", "mpls.psc.dpath", FT_UINT8,
                 BASE_RANGE_STRING | BASE_DEC,
-                RVALS(&mpls_psc_dpath_rvals),
+                RVALS(mpls_psc_dpath_rvals),
                 0x0, NULL, HFILL
             }
         },
diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index 1f84e9d7c9..f3c14f608b 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -3291,22 +3291,22 @@ proto_register_omron_fins(void)
         { "Gateway Count", "omron.gct", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
         { &hf_omron_dna,
-        { "Destination network address", "omron.dna", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_dna_range), 0x0, NULL, HFILL }},
+        { "Destination network address", "omron.dna", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_dna_range), 0x0, NULL, HFILL }},
 
         { &hf_omron_da1,
-        { "Destination node number", "omron.da1", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_da1_range), 0x0, NULL, HFILL }},
+        { "Destination node number", "omron.da1", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_da1_range), 0x0, NULL, HFILL }},
 
         { &hf_omron_da2,
-        { "Destination unit address", "omron.da2", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_da2_range), 0x0, NULL, HFILL }},
+        { "Destination unit address", "omron.da2", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_da2_range), 0x0, NULL, HFILL }},
 
         { &hf_omron_sna,
-        { "Source network address", "omron.sna", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_sna_range), 0x0, NULL, HFILL }},
+        { "Source network address", "omron.sna", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_sna_range), 0x0, NULL, HFILL }},
 
         { &hf_omron_sa1,
-        { "Source node number", "omron.sa1", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_sa1_range), 0x0, NULL, HFILL }},
+        { "Source node number", "omron.sa1", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_sa1_range), 0x0, NULL, HFILL }},
 
         { &hf_omron_sa2,
-        { "Source unit address", "omron.sa2", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_sa2_range), 0x0, NULL, HFILL }},
+        { "Source unit address", "omron.sa2", FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_sa2_range), 0x0, NULL, HFILL }},
 
         { &hf_omron_sid,
         { "Service ID", "omron.sid", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
@@ -3590,7 +3590,7 @@ proto_register_omron_fins(void)
         { &hf_omron_network_address,
         { "Network address", "omron.network_address", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_omron_error_reset_fals_no,
-        { "Error reset FAL no.", "omron.error_reset_fals_no", FT_UINT16, BASE_RANGE_STRING|BASE_HEX, RVALS(&omron_error_reset_range), 0x0, NULL, HFILL }},
+        { "Error reset FAL no.", "omron.error_reset_fals_no", FT_UINT16, BASE_RANGE_STRING|BASE_HEX, RVALS(omron_error_reset_range), 0x0, NULL, HFILL }},
         { &hf_omron_beginning_record_no,
         { "Beginning record no.", "omron.beginning_record_no", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_omron_no_of_records,
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 6458e9dff5..aeb7aed275 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -3363,7 +3363,7 @@ proto_register_ospf(void)
            BASE_HEX, NULL, 0x0, NULL, HFILL }},
         {&hf_ospf_filter[OSPFF_LS_MPLS_BC_MODEL_ID],
          { "MPLS/DSTE Bandwidth Constraints Model Id", "ospf.mpls.bc", FT_UINT8,
-           BASE_RANGE_STRING | BASE_DEC, RVALS(&mpls_link_stlv_bcmodel_rvals), 0x0,
+           BASE_RANGE_STRING | BASE_DEC, RVALS(mpls_link_stlv_bcmodel_rvals), 0x0,
            NULL, HFILL }},
 
         {&hf_ospf_filter[OSPFF_LS_OIF_LOCAL_NODE_ID],