diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-04-25 05:32:16 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-04-25 05:32:16 +0000 |
commit | 7456ee17e163ef6991da206dc536527eac38b5c8 (patch) | |
tree | 32831e587f1ef2f17d32be926ae3fa47c02b403c /packet-ranap.c | |
parent | 595241a676ea51b08d08f915a1165d9917bb56dd (diff) | |
download | wireshark-7456ee17e163ef6991da206dc536527eac38b5c8.tar.gz wireshark-7456ee17e163ef6991da206dc536527eac38b5c8.tar.bz2 wireshark-7456ee17e163ef6991da206dc536527eac38b5c8.zip |
Wrap "VALS()" around pointers to "value_string" arrays, to suppress GCC
complaints.
svn path=/trunk/; revision=3379
Diffstat (limited to 'packet-ranap.c')
-rw-r--r-- | packet-ranap.c | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/packet-ranap.c b/packet-ranap.c index 45c7cfe613..a7653ba775 100644 --- a/packet-ranap.c +++ b/packet-ranap.c @@ -3,7 +3,7 @@ * Based on 3GPP TS 25.413 V3.4.0 * Copyright 2001, Martin Held <Martin.Held@icn.siemens.de> * - * $Id: packet-ranap.c,v 1.1 2001/04/24 19:18:01 guy Exp $ + * $Id: packet-ranap.c,v 1.2 2001/04/25 05:32:15 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -4077,19 +4077,19 @@ proto_register_ranap(void) { &hf_ranap_pdu_index, { "RANAP-PDU Index", "ranap.ranap_pdu_index", - FT_UINT8, BASE_HEX, &ranap_pdu_index_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_pdu_index_values), 0x0, ""} }, { &hf_ranap_procedure_code, { "Procedure Code", "ranap.procedure_code", - FT_UINT8, BASE_DEC, &ranap_procedure_code_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_procedure_code_values), 0x0, ""} }, { &hf_ranap_pdu_criticality, { "Criticality of PDU", "ranap.pdu.criticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_pdu_number_of_octets, @@ -4101,7 +4101,7 @@ proto_register_ranap(void) { &hf_ranap_ie_protocol_extension, { "Protocol Extension", "ranap.ie.protocol_extension_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_number_of_ies, @@ -4125,7 +4125,7 @@ proto_register_ranap(void) { &hf_ranap_ie_ie_id, { "IE-ID", "ranap.ie.ie_id", - FT_UINT16, BASE_DEC, &ranap_ie_id_values, 0x0, + FT_UINT16, BASE_DEC, VALS(&ranap_ie_id_values), 0x0, ""} }, { &hf_ranap_ext_field_id, @@ -4137,25 +4137,25 @@ proto_register_ranap(void) { &hf_ranap_ie_criticality, { "Criticality of IE", "ranap.ie.criticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_ext_field_criticality, { "Criticality of ProtocolExtensionField", "ranap.ie.ProtocolExtensionFields.criticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_ie_pair_first_criticality, { "First Criticality", "ranap.ie_pair.first_criticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_ie_pair_second_criticality, { "Second Criticality", "ranap.ie_pair.second_criticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_ie_number_of_octets, @@ -4233,37 +4233,37 @@ proto_register_ranap(void) { &hf_ranap_nAS_SynchronisationIndicator_present, { "nAS-SynchronisationIndicator", "ranap.nAS-SynchronisationIndicator_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_rAB_Parameters_present, { "rAB-Parameters", "ranap.rAB_Parameters_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_userPlaneInformation_present, { "userPlaneInformation", "ranap.userPlaneInformation_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_transportLayerInformation_present, { "transportLayerInformation", "ranap.transportLayerInformation_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_service_Handover_present, { "service-Handover", "ranap.service_Handover_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_iE_Extensions_present, { "iE-Extensions", "ranap.ie.iE-Extensions_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_nAS_SynchronisationIndicator, @@ -4275,49 +4275,49 @@ proto_register_ranap(void) { &hf_ranap_guaranteedBitRate_present, { "guaranteedBitRate", "ranap.guaranteedBitRate_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_transferDelay_present, { "transferDelay", "ranap.transferDelay_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_trafficHandlingPriority_present, { "trafficHandlingPriority", "ranap.trafficHandlingPriority_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_allocationOrRetentionPriority_present, { "allocationOrRetentionPriority", "ranap.allocationOrRetentionPriority_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_sourceStatisticsDescriptor_present, { "sourceStatisticsDescriptor", "ranap.sourceStatisticsDescriptor_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_relocationRequirement_present, { "relocationRequirement", "ranap.relocationRequirement_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_trafficClass, { "Traffic Class", "ranap.rab_Parameters.trafficClass", - FT_UINT8, BASE_DEC, &ranap_trafficClass_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_trafficClass_values), 0x0, ""} }, { &hf_ranap_rAB_AsymmetryIndicator, { "rAB_AsymmetryIndicator", "ranap.rab_Parameters.rAB_AsymmetryIndicator", - FT_UINT8, BASE_DEC, &ranap_rAB_AsymmetryIndicator_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_rAB_AsymmetryIndicator_values), 0x0, ""} }, { &hf_ranap_maxBitrate, @@ -4335,7 +4335,7 @@ proto_register_ranap(void) { &hf_ranap_deliveryOrder, { "deliveryOrder", "ranap.rab_Parameters.deliveryOrder", - FT_UINT8, BASE_DEC, &ranap_DeliveryOrder_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_DeliveryOrder_values), 0x0, ""} }, { &hf_ranap_maxSDU_Size, @@ -4371,7 +4371,7 @@ proto_register_ranap(void) { &hf_ranap_deliveryOfErroneousSDU, { "deliveryOfErroneousSDU", "ranap.rab_Parameters.ranap_deliveryOfErroneousSDU", - FT_UINT8, BASE_DEC, &ranap_deliveryOfErroneousSDU_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_deliveryOfErroneousSDU_values), 0x0, ""} }, { &hf_ranap_subflowSDU_Size, @@ -4389,25 +4389,25 @@ proto_register_ranap(void) { &hf_ranap_sDU_ErrorRatio_present, { "sDU_ErrorRatio", "ranap.sDU_ErrorRatio_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_sDU_FormatInformationParameters_present, { "sDU_FormatInformationParameters", "ranap.sDU_FormatInformationParameters_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_subflowSDU_Size_present, { "subflowSDU_Size", "ranap.subflowSDU_Size_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_rAB_SubflowCombinationBitRate_present, { "subflowSDU_Size", "ranap.rAB_SubflowCombinationBitRate_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_transferDelay, @@ -4419,49 +4419,49 @@ proto_register_ranap(void) { &hf_ranap_trafficHandlingPriority, { "trafficHandlingPriority", "ranap.rab_Parameters.trafficHandlingPriority", - FT_UINT8, BASE_DEC, &ranap_priority_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_priority_values), 0x0, ""} }, { &hf_ranap_priorityLevel, { "priorityLevel", "ranap.rab_Parameters.allocationOrRetentionPriority.priorityLevel", - FT_UINT8, BASE_DEC, &ranap_priority_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_priority_values), 0x0, ""} }, { &hf_ranap_pre_emptionCapability, { "pre-emptionCapability", "ranap.rab_Parameters.allocationOrRetentionPriority.pre_emptionCapability", - FT_UINT8, BASE_DEC, &ranap_pre_emptionCapability_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_pre_emptionCapability_values), 0x0, ""} }, { &hf_ranap_pre_emptionVulnerability, { "pre-emptionVulnerability", "ranap.rab_Parameters.allocationOrRetentionPriority.pre_emptionVulnerability", - FT_UINT8, BASE_DEC, &ranap_pre_emptionVulnerability_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_pre_emptionVulnerability_values), 0x0, ""} }, { &hf_ranap_queuingAllowed, { "queuingAllowed", "ranap.rab_Parameters.allocationOrRetentionPriority.queuingAllowed", - FT_UINT8, BASE_DEC, &ranap_queuingAllowed_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_queuingAllowed_values), 0x0, ""} }, { &hf_ranap_sourceStatisticsDescriptor, { "sourceStatisticsDescriptor", "ranap.rab_Parameters.sourceStatisticsDescriptor", - FT_UINT8, BASE_DEC, &ranap_sourceStatisticsDescriptor_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_sourceStatisticsDescriptor_values), 0x0, ""} }, { &hf_ranap_relocationRequirement, { "relocationRequirement", "ranap.rab_Parameters.relocationRequirement", - FT_UINT8, BASE_DEC, &ranap_relocationRequirement_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_relocationRequirement_values), 0x0, ""} }, { &hf_ranap_userPlaneMode, { "userPlaneMode", "ranap.userPlaneMode", - FT_UINT8, BASE_DEC, &ranap_userPlaneMode_values, 0x0, + FT_UINT8, BASE_DEC, VALS(&ranap_userPlaneMode_values), 0x0, ""} }, { &hf_ranap_uP_ModeVersions, @@ -4509,49 +4509,49 @@ proto_register_ranap(void) { &hf_ranap_pDP_TypeInformation_present, { "pDP_TypeInformation", "ranap.pDP_TypeInformation_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dataVolumeReportingIndication_present, { "dataVolumeReportingIndication", "ranap.dataVolumeReportingIndication_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dl_GTP_PDU_SequenceNumber_present, { "dl_GTP_PDU_SequenceNumber", "ranap.dl_GTP_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_ul_GTP_PDU_SequenceNumber_present, { "ul_GTP_PDU_SequenceNumber", "ranap.ul_GTP_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dl_N_PDU_SequenceNumber_present, { "dl_N_PDU_SequenceNumber", "ranap.dl_N_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_ul_N_PDU_SequenceNumber_present, { "ul_N_PDU_SequenceNumber", "ranap.ul_N_PDU_SequenceNumber_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_PDP_Type, { "PDP-Type", "ranap.RAB_SetupOrModifyItemSecond.PDP_Type", - FT_UINT8, BASE_HEX, &ranap_PDP_Type_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_PDP_Type_values), 0x0, ""} }, { &hf_ranap_dataVolumeReportingIndication, { "dataVolumeReportingIndication", "ranap.RAB_SetupOrModifyItemSecond.dataVolumeReportingIndication", - FT_UINT8, BASE_HEX, &ranap_dataVolumeReportingIndication_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_dataVolumeReportingIndication_values), 0x0, ""} }, { &hf_ranap_dl_GTP_PDU_SequenceNumber, @@ -4581,37 +4581,37 @@ proto_register_ranap(void) { &hf_ranap_cause_choice, { "cause choice", "ranap.cause_choice", - FT_UINT8, BASE_HEX, &ranap_cause_choice_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_cause_choice_values), 0x0, ""} }, { &hf_ranap_cause_value, { "cause value", "ranap.cause_value", - FT_UINT8, BASE_DEC,&ranap_cause_value_str, 0x0, + FT_UINT8, BASE_DEC,VALS(&ranap_cause_value_str), 0x0, ""} }, { &hf_ranap_transportLayerAddress_present, { "transportLayerAddress", "ranap.transportLayerAddress_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_iuTransportAssociation_present, { "iuTransportAssociation", "ranap.iuTransportAssociation_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dl_dataVolumes_present, { "dl_dataVolumes", "ranap.dl_dataVolumes_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dataVolumeReference_present, { "dataVolumeReference", "ranap.dataVolumeReference_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume, @@ -4629,43 +4629,43 @@ proto_register_ranap(void) { &hf_ranap_procedureCode_present, { "procedureCode", "ranap.procedureCode_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_triggeringMessage_present, { "triggeringMessage", "ranap.triggeringMessage_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_procedureCriticality_present, { "procedureCriticality", "ranap.procedureCriticality_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_iEsCriticalityDiagnostics_present, { "iEsCriticalityDiagnostics", "ranap.iEsCriticalityDiagnostics_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_triggeringMessage, { "triggeringMessage", "ranap.triggeringMessage", - FT_UINT8, BASE_HEX, &ranap_pdu_index_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_pdu_index_values), 0x0, ""} }, { &hf_ranap_procedureCriticality, { "procedureCriticality", "ranap.procedureCriticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_iECriticality, { "iECriticality", "ranap.iECriticality", - FT_UINT8, BASE_HEX, &ranap_criticality_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_criticality_values), 0x0, ""} }, { &hf_ranap_repetitionNumber, @@ -4683,25 +4683,25 @@ proto_register_ranap(void) { &hf_ranap_repetitionNumber_present, { "repetitionNumber", "ranap.repetitionNumber_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_dl_UnsuccessfullyTransmittedDataVolume_present, { "dl-UnsuccessfullyTransmittedDataVolume", "ranap.dl_UnsuccessfullyTransmittedDataVolume_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_CN_DomainIndicator, { "CN-DomainIndicator", "ranap.CN_DomainIndicator", - FT_UINT8, BASE_HEX, &ranap_CN_DomainIndicator_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_CN_DomainIndicator_values), 0x0, ""} }, { &hf_ranap_service_Handover, { "service-Handover", "ranap.service_Handover", - FT_UINT8, BASE_HEX, &ranap_service_Handover_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_service_Handover_values), 0x0, ""} }, { &hf_ranap_IuSigConId, @@ -4713,19 +4713,19 @@ proto_register_ranap(void) { &hf_ranap_SAPI, { "SAPI", "ranap.IuSigConId", - FT_UINT8, BASE_HEX, &ranap_SAPI_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_SAPI_values), 0x0, ""} }, { &hf_ranap_msg_extension_present, { "Message Extension", "ranap.msg_extension_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_ProtocolExtensionContainer_present, { "ProtocolExtensionContainer", "ranap.ProtocolExtensionContainer_present", - FT_UINT8, BASE_HEX, &ranap_presence_values, 0x0, + FT_UINT8, BASE_HEX, VALS(&ranap_presence_values), 0x0, ""} }, { &hf_ranap_nas_pdu_length, |