diff options
| author | Guy Harris <gharris@sonic.net> | 2020-06-18 18:14:46 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-06-19 11:32:26 +0000 |
| commit | e1d9a226a2b8f2824a0eb162a8dc972e6e6c2dd4 (patch) | |
| tree | 75f56e3f0dde68ec92613cea3f482f7f426625de /epan/dissectors | |
| parent | 51bb2c4d7f515a24659ba0c0048392a81becda4e (diff) | |
Fix the type of arrays of pointers to hf_ values for bitfield routines.
The static arrays are supposed to be arrays of const pointers to int,
not arrays of non-const pointers to const int.
Fixing that means some bugs (scribbling on what's *supposed* to be a
const array) will be caught (see packet-ieee80211-radiotap.c for
examples, the first of which inspired this change and the second of
which was discovered while testing compiles with this change), and
removes the need for some annoying casts.
Also make some of those arrays static while we're at it.
Update documentation and dissector-generator tools.
Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc
Reviewed-on: https://code.wireshark.org/review/37517
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
455 files changed, 3688 insertions, 3707 deletions
diff --git a/epan/dissectors/asn1/c1222/packet-c1222-template.c b/epan/dissectors/asn1/c1222/packet-c1222-template.c index 5450cae39a..7b3a1ca5b3 100644 --- a/epan/dissectors/asn1/c1222/packet-c1222-template.c +++ b/epan/dissectors/asn1/c1222/packet-c1222-template.c @@ -83,7 +83,7 @@ static int hf_c1222_epsem_flags_ed_class = -1; static int hf_c1222_epsem_flags_security_modes = -1; static int hf_c1222_epsem_flags_response_control = -1; /* and the structure of the flag components */ -static const int *c1222_flags[] = { +static int * const c1222_flags[] = { &hf_c1222_epsem_flags_reserved, &hf_c1222_epsem_flags_recovery, &hf_c1222_epsem_flags_proxy, diff --git a/epan/dissectors/asn1/its/packet-its-template.c b/epan/dissectors/asn1/its/packet-its-template.c index 2af322c24b..6ebe0832b8 100644 --- a/epan/dissectors/asn1/its/packet-its-template.c +++ b/epan/dissectors/asn1/its/packet-its-template.c @@ -205,7 +205,7 @@ static int dissect_regextval_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static int dissect_denmssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - static const int *denmssp_flags[] = { + static int * const denmssp_flags[] = { &hf_denmssp_trafficCondition, &hf_denmssp_accident, &hf_denmssp_roadworks, @@ -244,7 +244,7 @@ static int dissect_denmssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static int dissect_camssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - static const int *camssp_flags[] = { + static int * const camssp_flags[] = { &hf_camssp_cenDsrcTollingZone, &hf_camssp_publicTransport, &hf_camssp_specialTransport, diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c index 406b69e655..517d739be4 100644 --- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c +++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c @@ -3183,7 +3183,7 @@ dissect_krb5_decrypt_EncryptedChallenge(gboolean imp_tag _U_, tvbuff_t *tvb, int } #endif /* HAVE_KERBEROS */ -static const int *hf_krb_pa_supported_enctypes_fields[] = { +static int * const hf_krb_pa_supported_enctypes_fields[] = { &hf_krb_pa_supported_enctypes_des_cbc_crc, &hf_krb_pa_supported_enctypes_des_cbc_md5, &hf_krb_pa_supported_enctypes_rc4_hmac, @@ -3215,7 +3215,7 @@ dissect_kerberos_PA_SUPPORTED_ENCTYPES(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const int *hf_krb_ad_ap_options_fields[] = { +static int * const hf_krb_ad_ap_options_fields[] = { &hf_krb_ad_ap_options_cbt, NULL, }; @@ -3899,7 +3899,7 @@ dissect_kerberos_KrbFastReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static const int * FastOptions_bits[] = { +static int * const FastOptions_bits[] = { &hf_kerberos_FastOptions_reserved, &hf_kerberos_FastOptions_hide_client_names, &hf_kerberos_FastOptions_spare_bit2, diff --git a/epan/dissectors/asn1/ldap/ldap.cnf b/epan/dissectors/asn1/ldap/ldap.cnf index 629eb67492..14228568c0 100644 --- a/epan/dissectors/asn1/ldap/ldap.cnf +++ b/epan/dissectors/asn1/ldap/ldap.cnf @@ -771,7 +771,7 @@ ldap_conv_info_t *ldap_info; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, -1, &val); if (val >0) { - const int *flags[] = { + static int * const flags[] = { &hf_ldap_object_security_flag, &hf_ldap_ancestor_first_flag, &hf_ldap_public_data_only_flag, diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 5c15bd2107..d192e36522 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -600,7 +600,7 @@ attribute_types_reset_cb(void) /* MS-ADTS specification, section 6.3.1.1, NETLOGON_NT_VERSION Options Bits */ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_mscldap_ntver_flags_v1, &hf_mscldap_ntver_flags_v5, &hf_mscldap_ntver_flags_v5ex, @@ -1373,7 +1373,7 @@ static const true_false_string tfs_ads_fnc = { }; static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_mscldap_netlogon_flags_fnc, &hf_mscldap_netlogon_flags_dnc, &hf_mscldap_netlogon_flags_dns, @@ -1683,7 +1683,7 @@ dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* static void ldap_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int * access_flags[] = { + static int * const access_flags[] = { &hf_ldap_AccessMask_ADS_CONTROL_ACCESS, &hf_ldap_AccessMask_ADS_LIST_OBJECT, &hf_ldap_AccessMask_ADS_DELETE_TREE, diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf index d12918c915..df6cd44291 100644 --- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf +++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf @@ -2524,7 +2524,7 @@ WLAN-OffloadConfig-r12/thresholdWLAN-RSSI-r12/thresholdWLAN-RSSI-High-r12 DISPLA #.FN_BODY MeasParameters-v1520/measGapPatterns-r15 if (meas_gap_pattern_tvb) { - static const int *lte_rrc_meas_gap_pattern_flags[] = { + static int * const lte_rrc_meas_gap_pattern_flags[] = { &hf_lte_rrc_measGapPatterns_r15_bit1, &hf_lte_rrc_measGapPatterns_r15_bit2, &hf_lte_rrc_measGapPatterns_r15_bit3, diff --git a/epan/dissectors/asn1/ngap/ngap.cnf b/epan/dissectors/asn1/ngap/ngap.cnf index 32838dd6a6..d6c40bd4bd 100644 --- a/epan/dissectors/asn1/ngap/ngap.cnf +++ b/epan/dissectors/asn1/ngap/ngap.cnf @@ -446,7 +446,7 @@ MaximumDataBurstVolume DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_byte_byt tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_InterfacesToTrace_NG_C, &hf_ngap_InterfacesToTrace_Xn_C, &hf_ngap_InterfacesToTrace_Uu, @@ -580,7 +580,7 @@ RecommendedCellItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_RATRestrictionInformation_e_UTRA, &hf_ngap_RATRestrictionInformation_nR, &hf_ngap_RATRestrictionInformation_reserved, @@ -594,7 +594,7 @@ RecommendedCellItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_NrencyptionAlgorithms_nea1, &hf_ngap_NrencyptionAlgorithms_nea2, &hf_ngap_NrencyptionAlgorithms_nea3, @@ -609,7 +609,7 @@ RecommendedCellItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_NrintegrityProtectionAlgorithms_nia1, &hf_ngap_NrintegrityProtectionAlgorithms_nia2, &hf_ngap_NrintegrityProtectionAlgorithms_nia3, @@ -624,7 +624,7 @@ RecommendedCellItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_EUTRAencryptionAlgorithms_eea1, &hf_ngap_EUTRAencryptionAlgorithms_eea2, &hf_ngap_EUTRAencryptionAlgorithms_eea3, @@ -639,7 +639,7 @@ RecommendedCellItem/timeStayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=& tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_EUTRAintegrityProtectionAlgorithms_eia1, &hf_ngap_EUTRAintegrityProtectionAlgorithms_eia2, &hf_ngap_EUTRAintegrityProtectionAlgorithms_eia3, diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf index cb30e29512..f6e932fb0e 100644 --- a/epan/dissectors/asn1/s1ap/s1ap.cnf +++ b/epan/dissectors/asn1/s1ap/s1ap.cnf @@ -858,7 +858,7 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_interfacesToTrace_S1_MME, &hf_s1ap_interfacesToTrace_X2, &hf_s1ap_interfacesToTrace_Uu, @@ -896,7 +896,7 @@ MME-Group-ID TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_encryptionAlgorithms_EEA1, &hf_s1ap_encryptionAlgorithms_EEA2, &hf_s1ap_encryptionAlgorithms_EEA3, @@ -911,7 +911,7 @@ MME-Group-ID TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_integrityProtectionAlgorithms_EIA1, &hf_s1ap_integrityProtectionAlgorithms_EIA2, &hf_s1ap_integrityProtectionAlgorithms_EIA3, @@ -1054,7 +1054,7 @@ ExtendedRepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_second tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_measurementsToActivate_M1, &hf_s1ap_measurementsToActivate_M2, &hf_s1ap_measurementsToActivate_M3, @@ -1073,7 +1073,7 @@ ExtendedRepetitionPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_second tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_MDT_Location_Info_GNSS, &hf_s1ap_MDT_Location_Info_E_CID, &hf_s1ap_MDT_Location_Info_Reserved, @@ -1128,7 +1128,7 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_NRencryptionAlgorithms_NEA1, &hf_s1ap_NRencryptionAlgorithms_NEA2, &hf_s1ap_NRencryptionAlgorithms_NEA3, @@ -1143,7 +1143,7 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_NRintegrityProtectionAlgorithms_NIA1, &hf_s1ap_NRintegrityProtectionAlgorithms_NIA2, &hf_s1ap_NRintegrityProtectionAlgorithms_NIA3, @@ -1158,7 +1158,7 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service, &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service, &hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved, diff --git a/epan/dissectors/asn1/spnego/packet-spnego-template.c b/epan/dissectors/asn1/spnego/packet-spnego-template.c index 603c0d378a..1a73e0b564 100644 --- a/epan/dissectors/asn1/spnego/packet-spnego-template.c +++ b/epan/dissectors/asn1/spnego/packet-spnego-template.c @@ -918,7 +918,7 @@ dissect_spnego_krb5_cfx_flags(tvbuff_t *tvb, int offset, proto_tree *spnego_krb5_tree, guint8 cfx_flags _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_spnego_krb5_cfx_flags_04, &hf_spnego_krb5_cfx_flags_02, &hf_spnego_krb5_cfx_flags_01, diff --git a/epan/dissectors/asn1/sv/packet-sv-template.c b/epan/dissectors/asn1/sv/packet-sv-template.c index 66e5ee7f42..2eccb3cd45 100644 --- a/epan/dissectors/asn1/sv/packet-sv-template.c +++ b/epan/dissectors/asn1/sv/packet-sv-template.c @@ -123,7 +123,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv guint32 qual; guint32 i; - static const int *q_flags[] = { + static int * const q_flags[] = { &hf_sv_phsmeas_q_validity, &hf_sv_phsmeas_q_overflow, &hf_sv_phsmeas_q_outofrange, diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf index 10fb1f5b68..810986b8b9 100644 --- a/epan/dissectors/asn1/x2ap/x2ap.cnf +++ b/epan/dissectors/asn1/x2ap/x2ap.cnf @@ -169,7 +169,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_ReportCharacteristics_PRBPeriodic, &hf_x2ap_ReportCharacteristics_TNLLoadIndPeriodic, &hf_x2ap_ReportCharacteristics_HWLoadIndPeriodic, @@ -191,7 +191,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC 32, 32, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_measurementFailedReportCharacteristics_PRBPeriodic, &hf_x2ap_measurementFailedReportCharacteristics_TNLLoadIndPeriodic, &hf_x2ap_measurementFailedReportCharacteristics_HWLoadIndPeriodic, @@ -305,7 +305,7 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_interfacesToTrace_S1_MME, &hf_x2ap_interfacesToTrace_X2, &hf_x2ap_interfacesToTrace_Uu, @@ -408,7 +408,7 @@ MME-Group-ID TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_encryptionAlgorithms_EEA1, &hf_x2ap_encryptionAlgorithms_EEA2, &hf_x2ap_encryptionAlgorithms_EEA3, @@ -423,7 +423,7 @@ MME-Group-ID TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_integrityProtectionAlgorithms_EIA1, &hf_x2ap_integrityProtectionAlgorithms_EIA2, &hf_x2ap_integrityProtectionAlgorithms_EIA3, @@ -453,7 +453,7 @@ MobilityParametersModificationRange/handoverTriggerChangeUpperLimit DISPLAY=BASE tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_measurementsToActivate_M1, &hf_x2ap_measurementsToActivate_M2, &hf_x2ap_measurementsToActivate_M3, @@ -478,7 +478,7 @@ Threshold-RSRQ DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Threshold_RSRQ_fmt) tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_MDT_Location_Info_GNSS, &hf_x2ap_MDT_Location_Info_E_CID, &hf_x2ap_MDT_Location_Info_Reserved, @@ -501,7 +501,7 @@ RSRPMeasurementResult/_item/rSRPMeasured DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2a tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_MDT_transmissionModes_tm1, &hf_x2ap_MDT_transmissionModes_tm2, &hf_x2ap_MDT_transmissionModes_tm3, @@ -538,7 +538,7 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_NRencryptionAlgorithms_NEA1, &hf_x2ap_NRencryptionAlgorithms_NEA2, &hf_x2ap_NRencryptionAlgorithms_NEA3, @@ -553,7 +553,7 @@ ExtendedBitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec tvbuff_t *parameter_tvb = NULL; %(DEFAULT_BODY)s if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_NRintegrityProtectionAlgorithms_NIA1, &hf_x2ap_NRintegrityProtectionAlgorithms_NIA2, &hf_x2ap_NRintegrityProtectionAlgorithms_NIA3, diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c index 8fa369a466..69a1a9eb3d 100644 --- a/epan/dissectors/file-mp4.c +++ b/epan/dissectors/file-mp4.c @@ -220,7 +220,7 @@ timescaled_val_to_str(guint64 val) static gint dissect_mp4_full_box(tvbuff_t *tvb, gint offset, proto_tree *tree, - const int **flags_fields, guint8 *version, guint32 *flags) + int * const *flags_fields, guint8 *version, guint32 *flags) { if (version) { *version = tvb_get_guint8(tvb, offset); @@ -344,7 +344,7 @@ dissect_mp4_tkhd_body(tvbuff_t *tvb, gint offset, gint len _U_, guint8 time_len; double width, height; guint16 fract_dec; - static const int* flags[] = { + static int * const flags[] = { &hf_mp4_tkhd_flags_enabled, &hf_mp4_tkhd_flags_in_movie, &hf_mp4_tkhd_flags_in_preview, @@ -571,7 +571,7 @@ dissect_mp4_url_body(tvbuff_t *tvb, gint offset, gint len, packet_info *pinfo _U_, guint depth _U_, proto_tree *tree) { guint32 flags; - static const int* flags_fields[] = { + static int * const flags_fields[] = { &hf_mp4_url_flags_media_data_location, NULL }; diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 7a008722f5..7d25aca5a3 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -151,13 +151,13 @@ static gint ett_pcapng_records = -1; static gint ett_pcapng_record = -1; static gint ett_pcapng_packet_data = -1; -static const int *hfx_pcapng_option_data_interface_timestamp_resolution[] = { +static int * const hfx_pcapng_option_data_interface_timestamp_resolution[] = { &hf_pcapng_option_data_interface_timestamp_resolution_base, &hf_pcapng_option_data_interface_timestamp_resolution_value, NULL }; -static const int *hfx_pcapng_option_data_packet_flags_link_layer_errors[] = { +static int * const hfx_pcapng_option_data_packet_flags_link_layer_errors[] = { &hf_pcapng_option_data_packet_flags_link_layer_errors_symbol, &hf_pcapng_option_data_packet_flags_link_layer_errors_preamble, &hf_pcapng_option_data_packet_flags_link_layer_errors_start_frame_delimiter, @@ -170,7 +170,7 @@ static const int *hfx_pcapng_option_data_packet_flags_link_layer_errors[] = { NULL }; -static const int *hfx_pcapng_option_data_packet_flags[] = { +static int * const hfx_pcapng_option_data_packet_flags[] = { &hf_pcapng_option_data_packet_flags_reserved, &hf_pcapng_option_data_packet_flags_fcs_length, &hf_pcapng_option_data_packet_flags_reception_type, @@ -178,7 +178,7 @@ static const int *hfx_pcapng_option_data_packet_flags[] = { NULL }; -static const int *hfx_pcapng_block_type[] = { +static int * const hfx_pcapng_block_type[] = { &hf_pcapng_block_type_vendor, &hf_pcapng_block_type_value, NULL diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 5baec228fb..0dd7ce238e 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -535,7 +535,7 @@ static const value_string a11_ses_msid_type_vals[] = { 0, NULL }, }; -static const int * a11_flags[] = { +static int * const a11_flags[] = { &hf_a11_s, &hf_a11_b, &hf_a11_d, diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index ae9cf9a566..f518269d42 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1311,7 +1311,7 @@ dissect_6lowpan_6loRH(tvbuff_t *tvb, guint offset, proto_tree *tree) gint16 loRHE_unitnums; struct ws_ip6_hdr ipv6; - const gint *bits_RHC[] = { + static int * const bits_RHC[] = { &hf_6lowpan_5_bit_o, &hf_6lowpan_5_bit_r, &hf_6lowpan_5_bit_f, @@ -1552,7 +1552,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg guint32 ipv6_flow; struct ws_ip6_hdr ipv6; struct lowpan_nhdr *nhdr_list; - static const int * hc1_encodings[] = { + static int * const hc1_encodings[] = { &hf_6lowpan_hc1_source_prefix, &hf_6lowpan_hc1_source_ifc, &hf_6lowpan_hc1_dest_prefix, @@ -1562,7 +1562,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg &hf_6lowpan_hc1_more, NULL }; - static const int * hc2_encodings[] = { + static int * const hc2_encodings[] = { &hf_6lowpan_hc2_udp_src, &hf_6lowpan_hc2_udp_dst, &hf_6lowpan_hc2_udp_len, diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 1231e0ee7f..7f8c9702de 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -960,7 +960,7 @@ static void dissect_9P_lflags(tvbuff_t *tvb, proto_tree *tree, int offset); static void dissect_9P_getattrflags(tvbuff_t *tvb, proto_tree *tree, int offset); static void dissect_9P_setattrflags(tvbuff_t *tvb, proto_tree *tree, int offset); -static const int * _9P_modes[] = { +static int * const _9P_modes[] = { &hf_9P_mode_c, &hf_9P_mode_t, &hf_9P_mode_rwx, diff --git a/epan/dissectors/packet-a21.c b/epan/dissectors/packet-a21.c index cebec9ac39..2fad045a1f 100644 --- a/epan/dissectors/packet-a21.c +++ b/epan/dissectors/packet-a21.c @@ -463,7 +463,7 @@ dissect_a21_mobile_subscription_information(tvbuff_t *tvb, packet_info *pinfo _U proto_item* ti; guint32 rec_len, sub_cls_len; - static const int* flags[] = { + static int * const flags[] = { &hf_a21_sc7, &hf_a21_sc6, &hf_a21_sc5, diff --git a/epan/dissectors/packet-acdr.c b/epan/dissectors/packet-acdr.c index 261cbadb4c..9d59143ba1 100644 --- a/epan/dissectors/packet-acdr.c +++ b/epan/dissectors/packet-acdr.c @@ -579,7 +579,7 @@ create_header_extension_subtree(proto_tree *tree, tvbuff_t *tvb, gint offset, gu // Gen3 only: we should add one byte of C5 Control Flags // C5 Control Flags - static const int *c5_cntrl_flags[] = { + static int * const c5_cntrl_flags[] = { &hf_acdr_ext_c5_control_favorite, NULL }; @@ -1055,7 +1055,7 @@ create_acdr_tree(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb) ((extra_data == 0xAA) && ((version & 0xF) <= 3))) { proto_tree_add_item(acdr_tree, hf_acdr_data, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - static const int *extra_data_bits[] = { + static int * const extra_data_bits[] = { &hf_acdr_data_li, &hf_acdr_data_mtce, &hf_acdr_data_encrypted, diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 6b23161437..fd67254f66 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -224,7 +224,7 @@ dissect_acp133_Community(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const int * OnSupported_bits[] = { +static int * const OnSupported_bits[] = { &hf_acp133_OnSupported_acp127_nn, &hf_acp133_OnSupported_acp127_pn, &hf_acp133_OnSupported_acp127_tn, diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index a7bfe198c5..8eb5ca9c6f 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -428,7 +428,7 @@ dissect_acse_EXTERNALt(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * T_AARQ_protocol_version_bits[] = { +static int * const T_AARQ_protocol_version_bits[] = { &hf_acse_T_AARQ_protocol_version_version1, NULL }; @@ -614,7 +614,7 @@ dissect_acse_AE_invocation_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * ACSE_requirements_bits[] = { +static int * const ACSE_requirements_bits[] = { &hf_acse_ACSE_requirements_authentication, &hf_acse_ACSE_requirements_aSO_context_negotiation, &hf_acse_ACSE_requirements_higher_level_association, @@ -964,7 +964,7 @@ dissect_acse_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * T_AARE_protocol_version_bits[] = { +static int * const T_AARE_protocol_version_bits[] = { &hf_acse_T_AARE_protocol_version_version1, NULL }; diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 39c0289b40..c4443f6138 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -135,7 +135,7 @@ dissect_UDPStatus(tvbuff_t *tvb, proto_tree *adwin_tree) proto_tree *debug_tree; proto_item *dt; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_adwin_config_status_bootloader, &hf_adwin_config_status_reprogrammable, &hf_adwin_config_status_configurable, diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index cd77a92b2b..322aee0395 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -2344,7 +2344,7 @@ static int dissect_aeron_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p proto_item * channel_item; proto_item * frame_length_item; guint32 frame_length; - static const int * flags[] = + static int * const flags[] = { &hf_aeron_data_flags_b, &hf_aeron_data_flags_e, @@ -2547,7 +2547,7 @@ static int dissect_aeron_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, pro proto_item * item; proto_item * rcv_window_item; guint32 frame_length; - static const int * flags[] = + static int * const flags[] = { &hf_aeron_sm_flags_s, NULL @@ -2686,7 +2686,7 @@ static int dissect_aeron_heartbeat(tvbuff_t * tvb, int offset, packet_info * pin proto_item * channel_item; proto_item * frame_length_item; guint32 frame_length; - static const int * flags[] = + static int * const flags[] = { &hf_aeron_heartbeat_flags_b, &hf_aeron_heartbeat_flags_e, @@ -2755,7 +2755,7 @@ static int dissect_aeron_rtt(tvbuff_t * tvb, int offset, packet_info * pinfo, pr proto_item * frame_length_item; proto_item * item; guint32 frame_length; - static const int * flags[] = + static int * const flags[] = { &hf_aeron_rtt_flags_r, NULL diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 964f7eb029..f977844c4b 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -1192,7 +1192,7 @@ static guint16 decode_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) { guint16 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_vol_bitmap_Attributes, &hf_afp_vol_bitmap_Signature, &hf_afp_vol_bitmap_CreateDate, @@ -1220,7 +1220,7 @@ static guint16 decode_vol_attribute (proto_tree *tree, tvbuff_t *tvb, gint offset) { guint16 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_vol_attribute_ReadOnly, &hf_afp_vol_attribute_HasVolumePassword, &hf_afp_vol_attribute_SupportsFileIDs, @@ -1336,7 +1336,7 @@ static guint16 decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) { guint16 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_file_bitmap_Attributes, &hf_afp_file_bitmap_ParentDirID, &hf_afp_file_bitmap_CreateDate, @@ -1368,7 +1368,7 @@ static guint16 decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) { guint16 attribute; - static const int * not_shared_attr[] = { + static int * const not_shared_attr[] = { &hf_afp_file_attribute_Invisible, &hf_afp_file_attribute_MultiUser, &hf_afp_file_attribute_System, @@ -1384,7 +1384,7 @@ decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) NULL }; - static const int * shared_attr[] = { + static int * const shared_attr[] = { &hf_afp_file_attribute_Invisible, &hf_afp_file_attribute_System, &hf_afp_file_attribute_WriteInhibit, @@ -1413,7 +1413,7 @@ decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) static void decode_access_rights (proto_tree *tree, tvbuff_t *tvb, int hf, gint offset) { - static const int * rights[] = { + static int * const rights[] = { &hf_afp_dir_ar_o_search, &hf_afp_dir_ar_o_read, &hf_afp_dir_ar_o_write, @@ -1615,7 +1615,7 @@ static guint16 decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) { guint16 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_dir_bitmap_Attributes, &hf_afp_dir_bitmap_ParentDirID, &hf_afp_dir_bitmap_CreateDate, @@ -1646,7 +1646,7 @@ static guint16 decode_dir_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset) { guint16 attribute; - static const int * attributes[] = { + static int * const attributes[] = { &hf_afp_dir_attribute_Invisible, &hf_afp_dir_attribute_IsExpFolder, &hf_afp_dir_attribute_System, @@ -2062,7 +2062,7 @@ dissect_reply_afp_get_server_param(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_tree *sub_tree; proto_item *item; - static const int * flags[] = { + static int * const flags[] = { &hf_afp_vol_flag_passwd, &hf_afp_vol_flag_has_config, NULL @@ -2126,7 +2126,7 @@ dissect_query_afp_with_vol_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static gint dissect_query_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { - static const int * access[] = { + static int * const access[] = { &hf_afp_access_read, &hf_afp_access_write, &hf_afp_access_deny_read, @@ -3660,7 +3660,7 @@ dissect_reply_afp_get_session_token(tvbuff_t *tvb, packet_info *pinfo _U_, proto } /* ************************** */ -static const int * afp_message_bitmaps[] = { +static int * const afp_message_bitmaps[] = { &hf_afp_message_bitmap_REQ, &hf_afp_message_bitmap_UTF, NULL @@ -3732,7 +3732,7 @@ dissect_reply_afp_get_server_message(tvbuff_t *tvb, packet_info *pinfo _U_, prot } /* ************************** */ -static const int * afp_user_bitmaps[] = { +static int * const afp_user_bitmaps[] = { &hf_afp_user_bitmap_UID, &hf_afp_user_bitmap_GID, &hf_afp_user_bitmap_UUID, @@ -3816,7 +3816,7 @@ decode_attr_name (proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, gint static gint decode_attr_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) { - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_extattr_bitmap_NoFollow, &hf_afp_extattr_bitmap_Create, &hf_afp_extattr_bitmap_Replace, @@ -3989,7 +3989,7 @@ static gint decode_acl_access_bitmap(tvbuff_t *tvb, proto_tree *tree, gint offset) { guint32 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_acl_access_bitmap_read_data, &hf_afp_acl_access_bitmap_write_data, &hf_afp_acl_access_bitmap_execute, @@ -4577,7 +4577,7 @@ static guint16 decode_acl_list_bitmap(tvbuff_t *tvb, proto_tree *tree, gint offset) { guint16 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_acl_list_bitmap_UUID, &hf_afp_acl_list_bitmap_GRPUUID, &hf_afp_acl_list_bitmap_ACL, @@ -4599,7 +4599,7 @@ decode_ace_flags_bitmap(tvbuff_t *tvb, proto_tree *tree, gint offset) { guint32 bitmap; - static const int * bitmaps[] = { + static int * const bitmaps[] = { &hf_afp_ace_flags_allow, &hf_afp_ace_flags_deny, &hf_afp_ace_flags_inherited, @@ -4826,7 +4826,7 @@ dissect_afp_server_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint len; guint i; - static const int * flags[] = { + static int * const flags[] = { &hf_afp_server_flag_copyfile, &hf_afp_server_flag_passwd, &hf_afp_server_flag_no_save_passwd, diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index d758dca4d9..fd096761e4 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -654,7 +654,7 @@ static void OUT_CB_AFSFid(ptvcursor_t *cursor, const char* label) /* Output a StoreStatus */ static void OUT_FS_AFSStoreStatus(ptvcursor_t *cursor, const char* label) { - static const int * status_mask_flags[] = { + static int * const status_mask_flags[] = { &hf_afs_fs_status_mask_setmodtime, &hf_afs_fs_status_mask_setowner, &hf_afs_fs_status_mask_setgroup, @@ -2361,7 +2361,7 @@ dissect_prot_request(ptvcursor_t *cursor, struct rxinfo *rxinfo _U_, int opcode) static void dissect_vldb_reply(ptvcursor_t *cursor, struct rxinfo *rxinfo, int opcode) { - static const int * vldb_flags[] = { + static int * const vldb_flags[] = { &hf_afs_vldb_flags_rwexists, &hf_afs_vldb_flags_roexists, &hf_afs_vldb_flags_bkexists, diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index b9b8b8b556..b623ddb4cc 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -785,7 +785,7 @@ dissect_agentx_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da guint32 trans_id; guint32 packet_id; guint32 payload_len; - static const int * pdu_flags[] = { + static int * const pdu_flags[] = { &hf_flags_register, &hf_flags_newindex, &hf_flags_anyindex, diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 017a280cc6..ba51b2c1c7 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -727,7 +727,7 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, if( aim_tree && subtype != NULL ) { - static const int * fnac_flags[] = { + static int * const fnac_flags[] = { &hf_aim_fnac_flag_next_is_related, &hf_aim_fnac_flag_contains_version, NULL @@ -1111,7 +1111,7 @@ static int dissect_aim_userclass(tvbuff_t *tvb, int offset, int len, proto_item *ti, guint32 value) { proto_tree *entry; - static const int * flags[] = { + static int * const flags[] = { &hf_aim_userclass_unconfirmed, &hf_aim_userclass_administrator, &hf_aim_userclass_aol, @@ -2347,7 +2347,7 @@ static int dissect_aim_generic_migration_req(tvbuff_t *tvb, packet_info *pinfo, static int dissect_aim_generic_setprivflags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_generic_allow_idle_see, &hf_generic_allow_member_see, NULL @@ -3164,7 +3164,7 @@ dissect_aim_rendezvous_extended_message(tvbuff_t *tvb, proto_tree *msg_tree) { int offset = 0; guint32 text_length; - static const int * flags[] = { + static int * const flags[] = { &hf_aim_rendezvous_extended_data_message_flags_normal, &hf_aim_rendezvous_extended_data_message_flags_auto, &hf_aim_rendezvous_extended_data_message_flags_multi, diff --git a/epan/dissectors/packet-ain.c b/epan/dissectors/packet-ain.c index 2582f9328f..ab8147d4e0 100644 --- a/epan/dissectors/packet-ain.c +++ b/epan/dissectors/packet-ain.c @@ -3415,7 +3415,7 @@ dissect_ain_GenericDigitsList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * ApplyRestrictions_U_bits[] = { +static int * const ApplyRestrictions_U_bits[] = { &hf_ain_ApplyRestrictions_U_code, &hf_ain_ApplyRestrictions_U_toll, NULL @@ -5621,7 +5621,7 @@ dissect_ain_DelayInterval(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const int * Empty_bits[] = { +static int * const Empty_bits[] = { &hf_ain_Empty_entireList, &hf_ain_Empty_outgoingmemorySlot, &hf_ain_Empty_incomingmemorySlot, @@ -5709,7 +5709,7 @@ dissect_ain_Service1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Request1_bits[] = { +static int * const Request1_bits[] = { &hf_ain_Request1_activationStatus, NULL }; @@ -5754,7 +5754,7 @@ dissect_ain_Service2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Request2_bits[] = { +static int * const Request2_bits[] = { &hf_ain_Request2_activationStatus, &hf_ain_Request2_delayInterval, NULL @@ -5801,7 +5801,7 @@ dissect_ain_Service3(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Request3_bits[] = { +static int * const Request3_bits[] = { &hf_ain_Request3_activationStatus, &hf_ain_Request3_entireList, &hf_ain_Request3_listSize, @@ -5850,7 +5850,7 @@ dissect_ain_Service4(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Request4_bits[] = { +static int * const Request4_bits[] = { &hf_ain_Request4_activationStatus, &hf_ain_Request4_forwardingDn, NULL @@ -5897,7 +5897,7 @@ dissect_ain_Service5(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Request5_bits[] = { +static int * const Request5_bits[] = { &hf_ain_Request5_activationStatus, &hf_ain_Request5_forwardingDn, &hf_ain_Request5_entireList, @@ -5945,7 +5945,7 @@ dissect_ain_Service6(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Request6_bits[] = { +static int * const Request6_bits[] = { &hf_ain_Request6_delayInterval, NULL }; @@ -6005,7 +6005,7 @@ dissect_ain_RequestGroups(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const int * RequestMemorySlot_bits[] = { +static int * const RequestMemorySlot_bits[] = { &hf_ain_RequestMemorySlot_incoming, &hf_ain_RequestMemorySlot_outgoing, NULL @@ -6065,7 +6065,7 @@ dissect_ain_QueryRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const int * EDPRequest_U_bits[] = { +static int * const EDPRequest_U_bits[] = { &hf_ain_EDPRequest_U_oCalledPartyBusy, &hf_ain_EDPRequest_U_oNoAnswer, &hf_ain_EDPRequest_U_oTermSeized, @@ -6110,7 +6110,7 @@ dissect_ain_EDPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * EDPNotification_U_bits[] = { +static int * const EDPNotification_U_bits[] = { &hf_ain_EDPNotification_U_oCalledPartyBusy, &hf_ain_EDPNotification_U_oNoAnswer, &hf_ain_EDPNotification_U_oTermSeized, diff --git a/epan/dissectors/packet-amp.c b/epan/dissectors/packet-amp.c index d3de5c92a2..9fb07c714c 100644 --- a/epan/dissectors/packet-amp.c +++ b/epan/dissectors/packet-amp.c @@ -164,7 +164,7 @@ static const value_string amp_ari_struct_type[] = { /* AMP Message Header */ -static const int *amp_message_header[] = { +static int * const amp_message_header[] = { &hf_amp_reserved, &hf_amp_acl, &hf_amp_nack, @@ -174,7 +174,7 @@ static const int *amp_message_header[] = { }; /* TNVC Flags */ -static const int *amp_tnvc_flags[] = { +static int * const amp_tnvc_flags[] = { &hf_amp_tnvc_reserved, &hf_amp_tnvc_mixed, &hf_amp_tnvc_typed, @@ -184,7 +184,7 @@ static const int *amp_tnvc_flags[] = { }; /* ARI Flags */ -static const int *amp_ari_flags[] = { +static int * const amp_ari_flags[] = { &hf_ari_nickname, &hf_ari_parameters, &hf_ari_issuer, diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index 741317f769..8b41c80e6d 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -501,7 +501,7 @@ static void for_pr_gps_almanac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint len, guint32 offset) { guint32 saved_offset = offset; - const gint *fields[] = { + int * const fields[] = { &hf_ansi_801_num_sv_p32, &hf_ansi_801_week_num, &hf_ansi_801_toa, @@ -522,7 +522,7 @@ static void for_pr_gps_nav_msg_bits(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint len, guint32 offset) { guint32 saved_offset = offset; - const gint *fields[] = { + int * const fields[] = { &hf_ansi_801_num_sv_p16, &hf_ansi_801_part_num16, &hf_ansi_801_total_parts16, diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index a477b9d4c1..95d8b9e496 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -188,7 +188,7 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree, const gchar *orig_addr_v6; guint32 orig_seqno; int extlen; - static const int * aodv_flags[] = { + static int * const aodv_flags[] = { &hf_aodv_flags_rreq_join, &hf_aodv_flags_rreq_repair, &hf_aodv_flags_rreq_gratuitous, @@ -286,7 +286,7 @@ dissect_aodv_rrep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree, const gchar *orig_addr_v6; guint32 lifetime; int extlen; - static const int * aodv_flags[] = { + static int * const aodv_flags[] = { &hf_aodv_flags_rrep_repair, &hf_aodv_flags_rrep_ack, NULL @@ -382,7 +382,7 @@ dissect_aodv_rerr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree, proto_tree *aodv_unreach_dest_tree; guint8 dest_count; int i; - static const int * aodv_flags[] = { + static int * const aodv_flags[] = { &hf_aodv_flags_rerr_nodelete, NULL }; @@ -438,7 +438,7 @@ dissect_aodv_draft_01_v6_rreq(tvbuff_t *tvb, packet_info *pinfo, const gchar *dest_addr_v6; const gchar *orig_addr_v6; int extlen; - static const int * aodv_flags[] = { + static int * const aodv_flags[] = { &hf_aodv_flags_rreq_join, &hf_aodv_flags_rreq_repair, &hf_aodv_flags_rreq_gratuitous, @@ -515,7 +515,7 @@ dissect_aodv_draft_01_v6_rrep(tvbuff_t *tvb, packet_info *pinfo, const gchar *orig_addr_v6; guint32 lifetime; int extlen; - static const int * aodv_flags[] = { + static int * const aodv_flags[] = { &hf_aodv_flags_rrep_repair, &hf_aodv_flags_rrep_ack, NULL @@ -587,7 +587,7 @@ dissect_aodv_draft_01_v6_rerr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_unreach_dest_tree; guint8 dest_count; int i; - static const int * aodv_flags[] = { + static int * const aodv_flags[] = { &hf_aodv_flags_rerr_nodelete, NULL }; diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index e68171ca02..b84ae81570 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -2869,7 +2869,7 @@ static int hf_artnet_poll_target_port_bottom = -1; static gint ett_artnet_poll_talktome = -1; -static const int *artnet_poll_talktome_fields[] = { +static int * const artnet_poll_talktome_fields[] = { &hf_artnet_poll_talktome_reply_change, &hf_artnet_poll_talktome_diag, &hf_artnet_poll_talktome_diag_unicast, @@ -2988,7 +2988,7 @@ static int hf_artnet_poll_reply_good_input_dmx_sip = -1; static int hf_artnet_poll_reply_good_input_dmx_test = -1; static int hf_artnet_poll_reply_good_input_data = -1; -static const int *artnet_poll_reply_status_fields[] = { +static int * const artnet_poll_reply_status_fields[] = { &hf_artnet_poll_reply_status_ubea_present, &hf_artnet_poll_reply_status_rdm_supported, &hf_artnet_poll_reply_status_rom_booted, @@ -2997,7 +2997,7 @@ static const int *artnet_poll_reply_status_fields[] = { NULL }; -static const int *artnet_poll_reply_good_input_fields[] = { +static int * const artnet_poll_reply_good_input_fields[] = { &hf_artnet_poll_reply_good_input_recv_error, &hf_artnet_poll_reply_good_input_disabled, &hf_artnet_poll_reply_good_input_dmx_text, @@ -3007,7 +3007,7 @@ static const int *artnet_poll_reply_good_input_fields[] = { NULL }; -static const int *artnet_poll_reply_good_output_fields[] = { +static int * const artnet_poll_reply_good_output_fields[] = { &hf_artnet_poll_reply_good_output_merge_ltp, &hf_artnet_poll_reply_good_output_short, &hf_artnet_poll_reply_good_output_merge_artnet, @@ -3018,7 +3018,7 @@ static const int *artnet_poll_reply_good_output_fields[] = { NULL }; -static const int *artnet_poll_reply_status2_fields[] = { +static int * const artnet_poll_reply_status2_fields[] = { &hf_artnet_poll_reply_status2_web_supported, &hf_artnet_poll_reply_status2_dhcp_used, &hf_artnet_poll_reply_status2_dhcp_supported, @@ -3059,13 +3059,13 @@ static int hf_artnet_address_command = -1; static gint ett_artnet_address_netswitch = -1; static gint ett_artnet_address_subswitch = -1; -static const int *artnet_address_netswitch_fields[] = { +static int * const artnet_address_netswitch_fields[] = { &hf_artnet_address_netswitch_net, &hf_artnet_address_netswitch_write, NULL }; -static const int *artnet_address_subswitch_fields[] = { +static int * const artnet_address_subswitch_fields[] = { &hf_artnet_address_subswitch_sub, &hf_artnet_address_subswitch_write, NULL @@ -3179,7 +3179,7 @@ static int hf_artnet_ip_prog_port = -1; static gint ett_artnet_ip_prog_command = -1; -static const int *artnet_ip_prog_command_fields[] = { +static int * const artnet_ip_prog_command_fields[] = { &hf_artnet_ip_prog_command_prog_port, &hf_artnet_ip_prog_command_prog_sm, &hf_artnet_ip_prog_command_prog_ip, @@ -3201,7 +3201,7 @@ static int hf_artnet_ip_prog_reply_status_dhcp_enable = -1; static gint ett_artnet_ip_prog_reply_status = -1; -static const int *artnet_ip_prog_reply_status_fields[] = { +static int * const artnet_ip_prog_reply_status_fields[] = { &hf_artnet_ip_prog_reply_status_unused, &hf_artnet_ip_prog_reply_status_dhcp_enable, NULL diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c index 39f80f72d3..b6c53381ee 100644 --- a/epan/dissectors/packet-assa_r3.c +++ b/epan/dissectors/packet-assa_r3.c @@ -3011,7 +3011,7 @@ static const string_string r3_snmortisenames [] = { NULL, NULL } }; -static const int * r3_timezonearray[] = { +static int * const r3_timezonearray[] = { &hf_r3_timezonearray0, &hf_r3_timezonearray1, &hf_r3_timezonearray2, @@ -3047,7 +3047,7 @@ static const int * r3_timezonearray[] = { NULL }; -static const int * r3_definetimezone_daymap[] = { +static int * const r3_definetimezone_daymap[] = { &hf_r3_definetimezone_daymap0, &hf_r3_definetimezone_daymap1, &hf_r3_definetimezone_daymap2, @@ -3058,7 +3058,7 @@ static const int * r3_definetimezone_daymap[] = { NULL }; -static const int * r3_nvramclearoptions[] = { +static int * const r3_nvramclearoptions[] = { &hf_r3_nvramclearoptions0, &hf_r3_nvramclearoptions1, &hf_r3_nvramclearoptions2, @@ -4680,7 +4680,7 @@ dissect_r3_upstreammfgfield_peekpoke (tvbuff_t *tvb, guint32 start_offset, guint static void dissect_r3_upstreammfgfield_lockstate (tvbuff_t *tvb, guint32 start_offset, guint32 length _U_, packet_info *pinfo _U_, proto_tree *tree) { -static const int * r3_lockstate_flags[] = { +static int * const r3_lockstate_flags[] = { &hf_r3_lockstate_passage, &hf_r3_lockstate_panic, &hf_r3_lockstate_lockout, diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index ffe85c91b9..36752c96ec 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -1313,7 +1313,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint i; guint count; - static const int * zip_flags[] = { + static int * const zip_flags[] = { &hf_zip_flags_zone_invalid, &hf_zip_flags_use_broadcast, &hf_zip_flags_only_one_zone, diff --git a/epan/dissectors/packet-atn-ulcs.c b/epan/dissectors/packet-atn-ulcs.c index 9248022578..df8490667e 100644 --- a/epan/dissectors/packet-atn-ulcs.c +++ b/epan/dissectors/packet-atn-ulcs.c @@ -709,7 +709,7 @@ dissect_atn_ulcs_EXTERNALt(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * T_aarq_apdu_protocol_version_bits[] = { +static int * const T_aarq_apdu_protocol_version_bits[] = { &hf_atn_ulcs_T_aarq_apdu_protocol_version_version1, NULL }; @@ -935,7 +935,7 @@ dissect_atn_ulcs_AE_invocation_identifier(tvbuff_t *tvb _U_, int offset _U_, asn } -static const int * ACSE_requirements_bits[] = { +static int * const ACSE_requirements_bits[] = { &hf_atn_ulcs_ACSE_requirements_authentication, &hf_atn_ulcs_ACSE_requirements_application_context_negotiation, NULL @@ -1212,7 +1212,7 @@ dissect_atn_ulcs_AARQ_apdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * T_aare_apdu_protocol_version_bits[] = { +static int * const T_aare_apdu_protocol_version_bits[] = { &hf_atn_ulcs_T_aare_apdu_protocol_version_version1, NULL }; diff --git a/epan/dissectors/packet-autosar-nm.c b/epan/dissectors/packet-autosar-nm.c index e471089e0c..b2cc2dd36e 100644 --- a/epan/dissectors/packet-autosar-nm.c +++ b/epan/dissectors/packet-autosar-nm.c @@ -369,7 +369,7 @@ dissect_autosar_nm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void guint32 offset_ctrl_bit_vector = 1; guint32 offset_src_node_id = 0; - static const int * control_bits_legacy[] = { + static int * const control_bits_legacy[] = { &hf_autosar_nm_control_bit_vector_repeat_msg_req, &hf_autosar_nm_control_bit_vector_nm_coord_id, &hf_autosar_nm_control_bit_vector_nm_coord_sleep, @@ -380,7 +380,7 @@ dissect_autosar_nm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void NULL }; - static const int * control_bits[] = { + static int * const control_bits[] = { &hf_autosar_nm_control_bit_vector_repeat_msg_req, &hf_autosar_nm_control_bit_vector_reserved1, &hf_autosar_nm_control_bit_vector_reserved2, diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c index ce169abf02..26b18cbf91 100644 --- a/epan/dissectors/packet-awdl.c +++ b/epan/dissectors/packet-awdl.c @@ -561,7 +561,7 @@ static proto_item * add_awdl_version(tvbuff_t *tvb, int offset, proto_tree *tree) { proto_item *version_item; guint64 version; - static const int *fields[] = { + static int * const fields[] = { &hf_awdl_version_major, &hf_awdl_version_minor, NULL @@ -609,7 +609,7 @@ awdl_tag_service_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree *values_tree; int offset = 0; - static const int *bitmask_fields[] = { + static int * const bitmask_fields[] = { &hf_awdl_serviceparams_bitmask_0, &hf_awdl_serviceparams_bitmask_1, &hf_awdl_serviceparams_bitmask_2, @@ -645,7 +645,7 @@ awdl_tag_service_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, NULL }; - static const int *value_fields[] = { + static int * const value_fields[] = { &hf_awdl_serviceparams_values_0, &hf_awdl_serviceparams_values_1, &hf_awdl_serviceparams_values_2, @@ -707,7 +707,7 @@ awdl_tag_channel_sequence(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre wmem_strbuf_t *strbuf; int offset = 0; - static const int *flags_fields[] = { + static int * const flags_fields[] = { &hf_awdl_channelseq_legacy_control_channel, &hf_awdl_channelseq_legacy_bandwidth, &hf_awdl_channelseq_legacy_band, @@ -924,7 +924,7 @@ awdl_tag_datapath_state(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset = 0; guint16 flags; - static const int *flags_fields[] = { + static int * const flags_fields[] = { &hf_awdl_datastate_flags_0, &hf_awdl_datastate_flags_1, &hf_awdl_datastate_flags_2, @@ -944,7 +944,7 @@ awdl_tag_datapath_state(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, NULL }; - static const int *channel_map_fields[] = { + static int * const channel_map_fields[] = { &hf_awdl_datastate_social_channel_map_6, &hf_awdl_datastate_social_channel_map_44, &hf_awdl_datastate_social_channel_map_149, @@ -952,7 +952,7 @@ awdl_tag_datapath_state(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, NULL }; - static const int *extflags_fields[] = { + static int * const extflags_fields[] = { &hf_awdl_datastate_extflags_0, &hf_awdl_datastate_extflags_1, &hf_awdl_datastate_extflags_2, @@ -1057,7 +1057,7 @@ awdl_tag_ht_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree int offset = 0; int tag_len = tvb_reported_length(tvb); - static const int *awdl_ht[] = { + static int * const awdl_ht[] = { &hf_awdl_ht_ldpc_coding, &hf_awdl_ht_chan_width, &hf_awdl_ht_sm_pwsave, diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index 1078528c11..d43019b8d0 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -305,7 +305,7 @@ static gint ett_bacnet_update_control = -1; static dissector_handle_t bacnet_handle = NULL; -static const int * control_flags[] = { +static int * const control_flags[] = { &hf_bacnet_control_net, &hf_bacnet_control_res1, &hf_bacnet_control_dest, @@ -317,7 +317,7 @@ static const int * control_flags[] = { NULL }; -static const int * update_control_flags[] = { +static int * const update_control_flags[] = { &hf_bacnet_update_control_remove, &hf_bacnet_update_control_more_follows, &hf_bacnet_update_control_clear_set2, @@ -329,7 +329,7 @@ static const int * update_control_flags[] = { NULL }; -static const int * wrapper_control_flags[] = { +static int * const wrapper_control_flags[] = { &hf_bacnet_wrapper_control_secured_by_router, &hf_bacnet_wrapper_control_non_trusted_source, &hf_bacnet_wrapper_control_do_not_decrypt, diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 4160d17fcc..9db9d4e299 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -213,7 +213,7 @@ static int dissect_bat_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, struct batman_packet_v5 *batman_packeth; guint32 old_orig, orig; gint i; - static const int * batman_flags[] = { + static int * const batman_flags[] = { &hf_bat_batman_flags_unidirectional, &hf_bat_batman_flags_directlink, NULL diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 96e2394648..38fb944cf6 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -757,20 +757,20 @@ static const value_string tvlv_tt_typenames[] = { {0, NULL} }; -static const int * batman_v5_flags[] = { +static int * const batman_v5_flags[] = { &hf_batadv_batman_flags_directlink, &hf_batadv_batman_flags_vis_server, NULL }; -static const int * batman_v9_flags[] = { +static int * const batman_v9_flags[] = { &hf_batadv_batman_flags_directlink, &hf_batadv_batman_flags_vis_server, &hf_batadv_batman_flags_primaries_first_hop, NULL }; -static const int * batman_v14_flags[] = { +static int * const batman_v14_flags[] = { &hf_batadv_batman_flags_directlink, &hf_batadv_batman_flags_vis_server, &hf_batadv_batman_flags_primaries_first_hop, @@ -778,19 +778,19 @@ static const int * batman_v14_flags[] = { NULL }; -static const int * unicast_frag_flags[] = { +static int * const unicast_frag_flags[] = { &hf_batadv_unicast_frag_flags_head, &hf_batadv_unicast_frag_flags_largetail, NULL }; -static const int * tt_query_flags[] = { +static int * const tt_query_flags[] = { &hf_batadv_tt_query_flags_type, &hf_batadv_tt_query_flags_full_table, NULL }; -static const int * tt_entry_flags[] = { +static int * const tt_entry_flags[] = { &hf_batadv_tt_entry_flags_change_del, &hf_batadv_tt_entry_flags_client_roam, NULL @@ -1698,7 +1698,7 @@ static int dissect_batadv_iv_ogm_v15(tvbuff_t *tvb, int offset, guint8 type, version; struct iv_ogm_packet_v15 *iv_ogm_packeth; tvbuff_t *next_tvb; - static const int * flags[] = { + static int * const flags[] = { &hf_batadv_iv_ogm_flags_directlink, &hf_batadv_iv_ogm_flags_primaries_first_hop, &hf_batadv_iv_ogm_flags_not_best_next_hop, @@ -3998,7 +3998,7 @@ static int dissect_batadv_ogm2_v15(tvbuff_t *tvb, int offset, guint8 type, version; struct ogm2_packet_v15 *ogm2_packeth; tvbuff_t *next_tvb; - static const int * flags[] = { + static int * const flags[] = { NULL }; @@ -4318,7 +4318,7 @@ static void dissect_batadv_tvlv_v15_mcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 version) { - static const int * flags[] = { + static int * const flags[] = { &hf_batadv_tvlv_mcast_flags_unsnoopables, &hf_batadv_tvlv_mcast_flags_ipv4, &hf_batadv_tvlv_mcast_flags_ipv6, @@ -4369,7 +4369,7 @@ static void dissect_batadv_tvlv_v15_roam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint8 version) { - static const int * flags[] = { + static int * const flags[] = { &hf_batadv_tvlv_vid_vlan, &hf_batadv_tvlv_vid_tagged, NULL @@ -4397,7 +4397,7 @@ static void dissect_batadv_tvlv_v15_tt(tvbuff_t *tvb, packet_info *pinfo, guint16 num_vlan; int i; gint length_remaining; - static const int * flags[] = { + static int * const flags[] = { &hf_batadv_tvlv_tt_flags_type, &hf_batadv_tvlv_tt_flags_full_table, NULL @@ -4510,7 +4510,7 @@ static int dissect_batadv_tvlv_v15_tt_vlan(tvbuff_t *tvb, proto_tree *vlan_tree = NULL; guint16 vid; proto_item *ti = NULL; - static const int * flags[] = { + static int * const flags[] = { &hf_batadv_tvlv_vid_vlan, &hf_batadv_tvlv_vid_tagged, NULL @@ -4546,14 +4546,14 @@ static int dissect_batadv_tvlv_v15_tt_change(tvbuff_t *tvb, { proto_tree *change_tree; proto_item *ti; - static const int * flags[] = { + static int * const flags[] = { &hf_batadv_tvlv_tt_change_flags_del, &hf_batadv_tvlv_tt_change_flags_roam, &hf_batadv_tvlv_tt_change_flags_wifi, &hf_batadv_tvlv_tt_change_flags_isolate, NULL }; - static const int * flags_vlan[] = { + static int * const flags_vlan[] = { &hf_batadv_tvlv_vid_vlan, &hf_batadv_tvlv_vid_tagged, NULL diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index fe93e5cfb8..15c2bb8c58 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -3953,7 +3953,7 @@ malformed: /* 8.6 Encoding of a bitstring value */ int -dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, const int **named_bits, int num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) +dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, int * const *named_bits, int num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) { gint8 ber_class; gboolean pc, ind; @@ -4070,12 +4070,12 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto // Process 8 bits at a time instead of 64, each field masks a // single byte. const int bit_offset = 8 * i; - const int** section_named_bits = named_bits + bit_offset; + int* const* section_named_bits = named_bits + bit_offset; int* flags[9]; if (num_named_bits - bit_offset > 8) { memcpy(&flags[0], named_bits + bit_offset, 8 * sizeof(int*)); flags[8] = NULL; - section_named_bits = (const int** )flags; + section_named_bits = (int* const*)flags; } // If less data is available than the number of named bits, then @@ -4128,7 +4128,7 @@ dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto int -dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const int **named_bits, gint num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) +dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int * const *named_bits, gint num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) { return dissect_ber_constrained_bitstring(implicit_tag, actx, parent_tree, tvb, offset, -1, -1, named_bits, num_named_bits, hf_id, ett_id, out_tvb); } diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index 07bd09f2c9..0accaba95a 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -169,8 +169,8 @@ WS_DLL_PUBLIC int dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t WS_DLL_PUBLIC int dissect_ber_UTCTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char **datestrptr, guint32 *tvblen); -extern int dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, const int **named_bits, int num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); -WS_DLL_PUBLIC int dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const int **named_bits, gint num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); +extern int dissect_ber_constrained_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, gint32 min_len, gint32 max_len, int * const *named_bits, int num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); +WS_DLL_PUBLIC int dissect_ber_bitstring(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, int * const *named_bits, gint num_named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb); WS_DLL_PUBLIC int call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data); diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index b6f441699b..805faa3412 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -469,7 +469,7 @@ dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d switch (bfd_version) { case 0: { - static const int * bfd_message_flags[] = { + static int * const bfd_message_flags[] = { &hf_bfd_flags_h, &hf_bfd_flags_d_v0, &hf_bfd_flags_p_v0, @@ -482,7 +482,7 @@ dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case 1: default: { - static const int * bfd_message_flags[] = { + static int * const bfd_message_flags[] = { &hf_bfd_flags_p, &hf_bfd_flags_f, &hf_bfd_flags_c, diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index c29f21046a..f9da734a94 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -1861,7 +1861,7 @@ static int hf_bgp_evpn_nlri_igmp_mc_flags_v3 = -1; static int hf_bgp_evpn_nlri_igmp_mc_flags_ie = -1; static int hf_bgp_evpn_nlri_igmp_mc_flags_reserved = -1; -static const int *evpn_nlri_igmp_mc_flags[] = { +static int * const evpn_nlri_igmp_mc_flags[] = { &hf_bgp_evpn_nlri_igmp_mc_flags_v1, &hf_bgp_evpn_nlri_igmp_mc_flags_v2, &hf_bgp_evpn_nlri_igmp_mc_flags_v3, @@ -2421,7 +2421,7 @@ static int hf_bgp_ls_igp_te_metric_bandwidth_utilized = -1; static int hf_bgp_ls_igp_te_metric_bandwidth_utilized_value = -1; static int hf_bgp_ls_igp_te_metric_reserved = -1; -static const int *ls_igp_te_metric_flags[] = { +static int * const ls_igp_te_metric_flags[] = { &hf_bgp_ls_igp_te_metric_flags_a, &hf_bgp_ls_igp_te_metric_flags_reserved, NULL @@ -2931,7 +2931,7 @@ decode_mcast_vpn_nlri_addresses(proto_tree *tree, tvbuff_t *tvb, static void decode_bgp_flow_spec_dec_operator(proto_tree *tree, tvbuff_t *tvb, gint offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_flowspec_nlri_op_eol, &hf_bgp_flowspec_nlri_op_and, &hf_bgp_flowspec_nlri_op_val_len, @@ -3021,7 +3021,7 @@ decode_bgp_nlri_op_dec_value(proto_tree *parent_tree, proto_item *parent_item, t static void decode_bgp_flow_spec_bitmask_operator(proto_tree *tree, tvbuff_t *tvb, gint offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_flowspec_nlri_op_eol, &hf_bgp_flowspec_nlri_op_and, &hf_bgp_flowspec_nlri_op_val_len, @@ -3048,7 +3048,7 @@ decode_bgp_nlri_op_tcpf_value(proto_tree *parent_tree, proto_item *parent_item, guint8 shift_amount=0; guint first_loop=0; - static const int * nlri_tcp_flags[] = { + static int * const nlri_tcp_flags[] = { &hf_bgp_flowspec_nlri_tcp_flags_cwr, &hf_bgp_flowspec_nlri_tcp_flags_ecn, &hf_bgp_flowspec_nlri_tcp_flags_urg, @@ -3121,7 +3121,7 @@ decode_bgp_nlri_op_fflag_value(proto_tree *parent_tree, proto_item *parent_item, guint8 shift_amount=0; guint first_loop=0; - static const int * nlri_flags[] = { + static int * const nlri_flags[] = { &hf_bgp_flowspec_nlri_fflag_lf, &hf_bgp_flowspec_nlri_fflag_ff, &hf_bgp_flowspec_nlri_fflag_isf, @@ -4308,7 +4308,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa case BGP_NLRI_TLV_NODE_FLAG_BITS: { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_ls_node_flag_bits_overload, &hf_bgp_ls_node_flag_bits_attached, &hf_bgp_ls_node_flag_bits_external, @@ -4365,7 +4365,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa |I |V |H | | | | | | +--+--+--+--+--+--+--+--+ */ - static const int *sr_capabilities_flags[] = { + static int * const sr_capabilities_flags[] = { &hf_bgp_ls_sr_tlv_capabilities_flags_i, &hf_bgp_ls_sr_tlv_capabilities_flags_v, &hf_bgp_ls_sr_tlv_capabilities_flags_h, @@ -4587,7 +4587,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa break; } else { - static const int * nlri_flags[] = { + static int * const nlri_flags[] = { &hf_bgp_ls_link_protection_type_extra_traffic, &hf_bgp_ls_link_protection_type_unprotected, &hf_bgp_ls_link_protection_type_shared, @@ -4614,7 +4614,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa break; case BGP_NLRI_TLV_MPLS_PROTOCOL_MASK: { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_ls_mpls_protocol_mask_flag_l, &hf_bgp_ls_mpls_protocol_mask_flag_r, NULL @@ -4703,7 +4703,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa |F |B |V |L |S | | | | +--+--+--+--+--+--+--+--+ */ - static const int *adj_sid_isis_flags[] = { + static int * const adj_sid_isis_flags[] = { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_fi, &hf_bgp_ls_sr_tlv_adjacency_sid_flags_bi, &hf_bgp_ls_sr_tlv_adjacency_sid_flags_vi, @@ -4717,7 +4717,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa |B |V |L |S | | | | | +--+--+--+--+--+--+--+--+ */ - static const int *adj_sid_ospf_flags[] = { + static int * const adj_sid_ospf_flags[] = { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_bo, &hf_bgp_ls_sr_tlv_adjacency_sid_flags_vo, &hf_bgp_ls_sr_tlv_adjacency_sid_flags_lo, @@ -4859,7 +4859,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa |R |N |P |E |V |L | | | +--+--+--+--+--+--+--+--+ */ - static const int *prefix_sid_isis_flags[] = { + static int * const prefix_sid_isis_flags[] = { &hf_bgp_ls_sr_tlv_prefix_sid_flags_r, &hf_bgp_ls_sr_tlv_prefix_sid_flags_n, &hf_bgp_ls_sr_tlv_prefix_sid_flags_p, @@ -4874,7 +4874,7 @@ decode_link_state_attribute_tlv(proto_tree *tree, tvbuff_t *tvb, gint offset, pa | |NP|M |E |V |L | | | +--+--+--+--+--+--+--+--+ */ - static const int *prefix_sid_ospf_flags[] = { + static int * const prefix_sid_ospf_flags[] = { &hf_bgp_ls_sr_tlv_prefix_sid_flags_np, &hf_bgp_ls_sr_tlv_prefix_sid_flags_m, &hf_bgp_ls_sr_tlv_prefix_sid_flags_e, @@ -6360,7 +6360,7 @@ dissect_bgp_capability_item(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, else { int eclen = offset + clen; - static const int * timer_flags[] = { + static int * const timer_flags[] = { &hf_bgp_cap_gr_timers_restart_flag, &hf_bgp_cap_gr_timers_notification_flag, &hf_bgp_cap_gr_timers_restart_time, @@ -6380,7 +6380,7 @@ dissect_bgp_capability_item(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * read it until the TLV ends */ while (offset < eclen) { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_cap_gr_flag_pfs, NULL }; @@ -6532,7 +6532,7 @@ dissect_bgp_capability_item(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, offset += clen; } else { - static const int * bgpsec_flags[] = { + static int * const bgpsec_flags[] = { &hf_bgp_cap_bgpsec_version, &hf_bgp_cap_bgpsec_sendreceive, &hf_bgp_cap_bgpsec_reserved, @@ -7050,7 +7050,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_TYPE_HIGH_TR_QOS: /* QoS Marking [Thomas_Martin_Knoll] */ case BGP_EXT_COM_TYPE_HIGH_NTR_QOS: /* QoS Marking [Thomas_Martin_Knoll] */ { - static const int * qos_flags[] = { + static int * const qos_flags[] = { &hf_bgp_ext_com_qos_flags_remarking, &hf_bgp_ext_com_qos_flags_ignore_remarking, &hf_bgp_ext_com_qos_flags_agg_marking, @@ -7077,7 +7077,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, proto_item_set_text(community_item, "CoS Capability"); for (i=1; i < 8; i++) { - static const int * cos_flags[] = { + static int * const cos_flags[] = { &hf_bgp_ext_com_cos_flags_be, &hf_bgp_ext_com_cos_flags_ef, &hf_bgp_ext_com_cos_flags_af, @@ -7148,7 +7148,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_STYPE_EVPN_L2ATTR: { - static const int *l2attr_flags[] = { + static int * const l2attr_flags[] = { &hf_bgp_ext_com_evpn_l2attr_flag_reserved, &hf_bgp_ext_com_evpn_l2attr_flag_ci, &hf_bgp_ext_com_evpn_l2attr_flag_f, @@ -7169,7 +7169,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_STYPE_EVPN_ETREE: { - static const int *etree_flags[] = { + static int * const etree_flags[] = { &hf_bgp_ext_com_evpn_etree_flag_reserved, &hf_bgp_ext_com_evpn_etree_flag_l, NULL @@ -7284,7 +7284,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_STYPE_EXP_L2: { - static const int * com_l2_flags[] = { + static int * const com_l2_flags[] = { &hf_bgp_ext_com_l2_flag_d, &hf_bgp_ext_com_l2_flag_z1, &hf_bgp_ext_com_l2_flag_f, @@ -7303,7 +7303,7 @@ dissect_bgp_update_ext_com(proto_tree *parent_tree, tvbuff_t *tvb, guint16 tlen, case BGP_EXT_COM_STYPE_EXP_ETREE: { - static const int * com_etree_flags[] = { + static int * const com_etree_flags[] = { &hf_bgp_ext_com_etree_flag_reserved, &hf_bgp_ext_com_etree_flag_p, &hf_bgp_ext_com_etree_flag_v, @@ -7696,7 +7696,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len, guint8 asn_len = 0; guint32 as_num; - static const int * path_flags[] = { + static int * const path_flags[] = { &hf_bgp_update_path_attribute_flags_optional, &hf_bgp_update_path_attribute_flags_transitive, &hf_bgp_update_path_attribute_flags_partial, @@ -8299,19 +8299,19 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len, switch (encaps_tunnel_subtype) { case TUNNEL_SUBTLV_ENCAPSULATION: { - static const int * vxlan_flags[] = { + static int * const vxlan_flags[] = { &hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_valid_vnid, &hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_valid_mac, &hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_reserved, NULL }; - static const int * vxlan_gpe_flags[] = { + static int * const vxlan_gpe_flags[] = { &hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_version, &hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_valid_vnid, &hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_reserved, NULL }; - static const int * nvgre_flags[] = { + static int * const nvgre_flags[] = { &hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_valid_vnid, &hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_valid_mac, &hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_reserved, @@ -8382,7 +8382,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len, break; case TUNNEL_SUBTLV_BINDING_SID: { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_specified, &hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_invalid, &hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_reserved, @@ -8418,7 +8418,7 @@ dissect_bgp_path_attr(proto_tree *subtree, tvbuff_t *tvb, guint16 path_attr_len, break; case TUNNEL_SUBTLV_SEGMENT_LIST: { - static const int * flags[] = { + static int * const flags[] = { &hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_verification, &hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_algorithm, &hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_reserved, diff --git a/epan/dissectors/packet-bmp.c b/epan/dissectors/packet-bmp.c index a822c685df..1bab5f0518 100644 --- a/epan/dissectors/packet-bmp.c +++ b/epan/dissectors/packet-bmp.c @@ -569,7 +569,7 @@ dissect_bmp_peer_header(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int proto_item *ti; proto_item *subtree; - static const int * peer_flags[] = { + static int * const peer_flags[] = { &hf_peer_flags_ipv6, &hf_peer_flags_post_policy, &hf_peer_flags_as_path, @@ -577,7 +577,7 @@ dissect_bmp_peer_header(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int &hf_peer_flags_res, NULL }; - static const int * peer_flags_loc_rib[] = { + static int * const peer_flags_loc_rib[] = { &hf_peer_flags_loc_rib, &hf_peer_flags_loc_rib_res, NULL diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 37d3ddc444..80db9fdda9 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -341,13 +341,13 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp proto_tree *cist_bridge_id_tree; const char *sep; - static const int * bpdu_flags[] = { + static int * const bpdu_flags[] = { &hf_bpdu_flags_tcack, &hf_bpdu_flags_tc, NULL }; - static const int * rst_flags[] = { + static int * const rst_flags[] = { &hf_bpdu_flags_tcack, &hf_bpdu_flags_agreement, &hf_bpdu_flags_forwarding, @@ -924,7 +924,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_bp /* version 4 length is 55 or more. */ if (version_4_length >= 53) { - static const int * agreements[] = { + static int * const agreements[] = { &hf_bpdu_flags_agree_num, &hf_bpdu_flags_dagree_num, &hf_bpdu_flags_agree_valid, diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index cc8c89f330..f88ea0ed56 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -129,7 +129,7 @@ static const true_false_string tfs_error_ctrl = { static void dissect_brdwlk_err(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_brdwlk_error_plp, &hf_brdwlk_error_ef, &hf_brdwlk_error_nd, diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index d552a9cd5e..95a880d5e8 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -2677,7 +2677,7 @@ de_bssgp_list_of_setup_pfcs(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /* * 11.3.84 Extended Feature Bitmap */ -static const int *bssgp_ext_feature_bitmap_fields[] = { +static int * const bssgp_ext_feature_bitmap_fields[] = { &hf_bssgp_eDRX, &hf_bssgp_dcn, &hf_bssgp_ec_gsm_iot, @@ -3436,7 +3436,7 @@ static guint16 de_bssgp_pri_class_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { guint32 curr_offset; - const int* bssgp_prio_class_flags[] = { + static int* const bssgp_prio_class_flags[] = { &hf_bssgp_prio_class_flag_b0, NULL }; diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 67b5dbd66b..e4dba2c5dc 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -1186,14 +1186,14 @@ static int hf_response_in_frame = -1; static int btatt_tap_handles = -1; -static const int *hfx_btatt_opcode[] = { +static int * const hfx_btatt_opcode[] = { &hf_btatt_opcode_authentication_signature, &hf_btatt_opcode_command, &hf_btatt_opcode_method, NULL }; -static const int *hfx_btatt_characteristic_properties[] = { +static int * const hfx_btatt_characteristic_properties[] = { &hf_btatt_characteristic_properties_extended_properties, &hf_btatt_characteristic_properties_authenticated_signed_writes, &hf_btatt_characteristic_properties_indicate, @@ -1205,106 +1205,106 @@ static const int *hfx_btatt_characteristic_properties[] = { NULL }; -static const int *hfx_btatt_characteristic_configuration_client[] = { +static int * const hfx_btatt_characteristic_configuration_client[] = { &hf_btatt_characteristic_configuration_client_reserved, &hf_btatt_characteristic_configuration_client_indication, &hf_btatt_characteristic_configuration_client_notification, NULL }; -static const int *hfx_btatt_characteristic_configuration_server[] = { +static int * const hfx_btatt_characteristic_configuration_server[] = { &hf_btatt_characteristic_configuration_server_reserved, &hf_btatt_characteristic_configuration_server_broadcast, NULL }; -static const int *hfx_btatt_hogp_flags[] = { +static int * const hfx_btatt_hogp_flags[] = { &hf_btatt_hogp_flags_reserved, &hf_btatt_hogp_flags_normally_connectable, &hf_btatt_hogp_flags_remote_wake, NULL }; -static const int *hfx_btatt_characteristic_extended_properties[] = { +static int * const hfx_btatt_characteristic_extended_properties[] = { &hf_btatt_characteristic_extended_properties_reserved, &hf_btatt_characteristic_extended_properties_writable_auxiliaries, &hf_btatt_characteristic_extended_properties_reliable_write, NULL }; -static const int *hfx_btatt_appearance[] = { +static int * const hfx_btatt_appearance[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory, NULL }; -static const int *hfx_btatt_appearance_watch[] = { +static int * const hfx_btatt_appearance_watch[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_watch, NULL }; -static const int *hfx_btatt_appearance_thermometer[] = { +static int * const hfx_btatt_appearance_thermometer[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_thermometer, NULL }; -static const int *hfx_btatt_appearance_heart_rate[] = { +static int * const hfx_btatt_appearance_heart_rate[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_heart_rate, NULL }; -static const int *hfx_btatt_appearance_blood_pressure[] = { +static int * const hfx_btatt_appearance_blood_pressure[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_blood_pressure, NULL }; -static const int *hfx_btatt_appearance_hid[] = { +static int * const hfx_btatt_appearance_hid[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_hid, NULL }; -static const int *hfx_btatt_appearance_running_walking_sensor[] = { +static int * const hfx_btatt_appearance_running_walking_sensor[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_running_walking_sensor, NULL }; -static const int *hfx_btatt_appearance_cycling[] = { +static int * const hfx_btatt_appearance_cycling[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_cycling, NULL }; -static const int *hfx_btatt_appearance_pulse_oximeter[] = { +static int * const hfx_btatt_appearance_pulse_oximeter[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_pulse_oximeter, NULL }; -static const int *hfx_btatt_appearance_personal_mobility_device[] = { +static int * const hfx_btatt_appearance_personal_mobility_device[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_personal_mobility_device, NULL }; -static const int *hfx_btatt_appearance_insulin_pump[] = { +static int * const hfx_btatt_appearance_insulin_pump[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_insulin_pump, NULL }; -static const int *hfx_btatt_appearance_outdoor_sports_activity[] = { +static int * const hfx_btatt_appearance_outdoor_sports_activity[] = { &hf_btatt_appearance_category, &hf_btatt_appearance_subcategory_outdoor_sports_activity, NULL }; -static const int *hfx_btatt_time_adjust_reason[] = { +static int * const hfx_btatt_time_adjust_reason[] = { &hf_btatt_time_adjust_reason_reserved, &hf_btatt_time_adjust_reason_change_of_dst, &hf_btatt_time_adjust_reason_change_of_timezone, @@ -1313,7 +1313,7 @@ static const int *hfx_btatt_time_adjust_reason[] = { NULL }; -static const int *hfx_btatt_alert_status[] = { +static int * const hfx_btatt_alert_status[] = { &hf_btatt_alert_status_reserved, &hf_btatt_alert_status_display_alert_status, &hf_btatt_alert_status_vibrate_state, @@ -1321,7 +1321,7 @@ static const int *hfx_btatt_alert_status[] = { NULL }; -static const int *hfx_btatt_alert_category_id_bitmask_1[] = { +static int * const hfx_btatt_alert_category_id_bitmask_1[] = { &hf_btatt_alert_category_id_bitmask_1_schedule, &hf_btatt_alert_category_id_bitmask_1_voice_mail, &hf_btatt_alert_category_id_bitmask_1_sms_mms, @@ -1333,14 +1333,14 @@ static const int *hfx_btatt_alert_category_id_bitmask_1[] = { NULL }; -static const int *hfx_btatt_alert_category_id_bitmask_2[] = { +static int * const hfx_btatt_alert_category_id_bitmask_2[] = { &hf_btatt_alert_category_id_bitmask_2_reserved, &hf_btatt_alert_category_id_bitmask_2_instant_message, &hf_btatt_alert_category_id_bitmask_2_high_prioritized_alert, NULL }; -static const int *hfx_btatt_blood_pressure_feature[] = { +static int * const hfx_btatt_blood_pressure_feature[] = { &hf_btatt_blood_pressure_feature_reserved, &hf_btatt_blood_pressure_feature_multiple_bond, &hf_btatt_blood_pressure_feature_measurement_position_detection, @@ -1351,7 +1351,7 @@ static const int *hfx_btatt_blood_pressure_feature[] = { NULL }; -static const int *hfx_btatt_glucose_feature[] = { +static int * const hfx_btatt_glucose_feature[] = { &hf_btatt_glucose_feature_reserved, &hf_btatt_glucose_feature_multiple_bond, &hf_btatt_glucose_feature_time_fault, @@ -1367,7 +1367,7 @@ static const int *hfx_btatt_glucose_feature[] = { NULL }; -static const int *hfx_btatt_rsc_feature[] = { +static int * const hfx_btatt_rsc_feature[] = { &hf_btatt_rsc_feature_reserved, &hf_btatt_rsc_feature_multiple_sensor_locations, &hf_btatt_rsc_feature_calibration_procedure, @@ -1377,7 +1377,7 @@ static const int *hfx_btatt_rsc_feature[] = { NULL }; -static const int *hfx_btatt_csc_feature[] = { +static int * const hfx_btatt_csc_feature[] = { &hf_btatt_csc_feature_reserved, &hf_btatt_csc_feature_multiple_sensor_locations, &hf_btatt_csc_feature_crank_revolution_data, @@ -1385,7 +1385,7 @@ static const int *hfx_btatt_csc_feature[] = { NULL }; -static const int *hfx_btatt_descriptor_value_changed_flags[] = { +static int * const hfx_btatt_descriptor_value_changed_flags[] = { &hf_btatt_descriptor_value_changed_flags_reserved, &hf_btatt_descriptor_value_changed_flags_change_to_characteristic_user_description_descriptor, &hf_btatt_descriptor_value_changed_flags_change_to_es_measurement_descriptor, @@ -1395,7 +1395,7 @@ static const int *hfx_btatt_descriptor_value_changed_flags[] = { NULL }; -static const int *hfx_btatt_cycling_power_feature[] = { +static int * const hfx_btatt_cycling_power_feature[] = { &hf_btatt_cycling_power_feature_reserved, &hf_btatt_cycling_power_feature_factory_calibration_date, &hf_btatt_cycling_power_feature_instantaneous_measurement_direction, @@ -1419,7 +1419,7 @@ static const int *hfx_btatt_cycling_power_feature[] = { NULL }; -static const int *hfx_btatt_ln_feature[] = { +static int * const hfx_btatt_ln_feature[] = { &hf_btatt_ln_feature_reserved, &hf_btatt_ln_feature_position_status, &hf_btatt_ln_feature_elevation_setting, @@ -1445,7 +1445,7 @@ static const int *hfx_btatt_ln_feature[] = { NULL }; -static const int *hfx_btatt_body_composition_feature[] = { +static int * const hfx_btatt_body_composition_feature[] = { &hf_btatt_body_composition_feature_reserved, &hf_btatt_body_composition_feature_height_measurement_resolution, &hf_btatt_body_composition_feature_mass_measurement_resolution, @@ -1463,7 +1463,7 @@ static const int *hfx_btatt_body_composition_feature[] = { NULL }; -static const int *hfx_btatt_weight_scale_feature[] = { +static int * const hfx_btatt_weight_scale_feature[] = { &hf_btatt_weight_scale_feature_reserved, &hf_btatt_weight_scale_feature_height_measurement_resolution, &hf_btatt_weight_scale_feature_weight_measurement_resolution, @@ -1473,7 +1473,7 @@ static const int *hfx_btatt_weight_scale_feature[] = { NULL }; -static const int *hfx_btatt_glucose_measurement_flags[] = { +static int * const hfx_btatt_glucose_measurement_flags[] = { &hf_btatt_glucose_measurement_flags_reserved, &hf_btatt_glucose_measurement_flags_context_information_follows, &hf_btatt_glucose_measurement_flags_sensor_status_annunciation_present, @@ -1483,13 +1483,13 @@ static const int *hfx_btatt_glucose_measurement_flags[] = { NULL }; -static const int *hfx_btatt_glucose_measurement_type_and_sample_location[] = { +static int * const hfx_btatt_glucose_measurement_type_and_sample_location[] = { &hf_btatt_glucose_measurement_type_and_sample_location_type, &hf_btatt_glucose_measurement_type_and_sample_location_sample_location, NULL }; -static const int *hfx_btatt_glucose_measurement_sensor_status_annunciation[] = { +static int * const hfx_btatt_glucose_measurement_sensor_status_annunciation[] = { &hf_btatt_glucose_measurement_sensor_status_annunciation_reserved, &hf_btatt_glucose_measurement_sensor_status_annunciation_time_fault, &hf_btatt_glucose_measurement_sensor_status_annunciation_general_fault, @@ -1506,7 +1506,7 @@ static const int *hfx_btatt_glucose_measurement_sensor_status_annunciation[] = { NULL }; -static const int *hfx_btatt_bond_management_feature[] = { +static int * const hfx_btatt_bond_management_feature[] = { &hf_btatt_bond_management_feature_feature_extension, &hf_btatt_bond_management_feature_reserved, &hf_btatt_bond_management_feature_identify_yourself, @@ -1531,13 +1531,13 @@ static const int *hfx_btatt_bond_management_feature[] = { NULL }; -static const int *hfx_btatt_bond_management_feature_nth[] = { +static int * const hfx_btatt_bond_management_feature_nth[] = { &hf_btatt_bond_management_feature_nth_feature_extension, &hf_btatt_bond_management_feature_nth_reserved, NULL }; -static const int *hfx_btatt_temperature_measurement_flags[] = { +static int * const hfx_btatt_temperature_measurement_flags[] = { &hf_btatt_temperature_measurement_flags_reserved, &hf_btatt_temperature_measurement_flags_temperature_type, &hf_btatt_temperature_measurement_flags_timestamp, @@ -1545,7 +1545,7 @@ static const int *hfx_btatt_temperature_measurement_flags[] = { NULL }; -static const int *hfx_btatt_glucose_measurement_context_flags[] = { +static int * const hfx_btatt_glucose_measurement_context_flags[] = { &hf_btatt_glucose_measurement_context_flags_extended_flags, &hf_btatt_glucose_measurement_context_flags_hba1c, &hf_btatt_glucose_measurement_context_flags_medication_value_units, @@ -1557,18 +1557,18 @@ static const int *hfx_btatt_glucose_measurement_context_flags[] = { NULL }; -static const int *hfx_btatt_glucose_measurement_context_extended_flags[] = { +static int * const hfx_btatt_glucose_measurement_context_extended_flags[] = { &hf_btatt_glucose_measurement_context_extended_flags_reserved, NULL }; -static const int *hfx_btatt_glucose_measurement_context_tester_health[] = { +static int * const hfx_btatt_glucose_measurement_context_tester_health[] = { &hf_btatt_glucose_measurement_context_tester, &hf_btatt_glucose_measurement_context_health, NULL }; -static const int *hfx_btatt_blood_pressure_measurement_flags[] = { +static int * const hfx_btatt_blood_pressure_measurement_flags[] = { &hf_btatt_blood_pressure_measurement_flags_reserved, &hf_btatt_blood_pressure_measurement_flags_measurement_status, &hf_btatt_blood_pressure_measurement_flags_user_id, @@ -1578,7 +1578,7 @@ static const int *hfx_btatt_blood_pressure_measurement_flags[] = { NULL }; -static const int *hfx_btatt_blood_pressure_measurement_status[] = { +static int * const hfx_btatt_blood_pressure_measurement_status[] = { &hf_btatt_blood_pressure_measurement_status_reserved, &hf_btatt_blood_pressure_measurement_status_improper_measurement_position, &hf_btatt_blood_pressure_measurement_status_pulse_rate_range_detection, @@ -1588,7 +1588,7 @@ static const int *hfx_btatt_blood_pressure_measurement_status[] = { NULL }; -static const int *hfx_btatt_heart_rate_measurement_flags[] = { +static int * const hfx_btatt_heart_rate_measurement_flags[] = { &hf_btatt_heart_rate_measurement_flags_reserved, &hf_btatt_heart_rate_measurement_flags_rr_interval, &hf_btatt_heart_rate_measurement_flags_energy_expended, @@ -1598,7 +1598,7 @@ static const int *hfx_btatt_heart_rate_measurement_flags[] = { NULL }; -static const int *hfx_btatt_uncertainty[] = { +static int * const hfx_btatt_uncertainty[] = { &hf_btatt_uncertainty_reserved, &hf_btatt_uncertainty_precision, &hf_btatt_uncertainty_update_time, @@ -1606,7 +1606,7 @@ static const int *hfx_btatt_uncertainty[] = { NULL }; -static const int *hfx_btatt_indoor_positioning_configuration[] = { +static int * const hfx_btatt_indoor_positioning_configuration[] = { &hf_btatt_indoor_positioning_configuration_reserved, &hf_btatt_indoor_positioning_configuration_location_name, &hf_btatt_indoor_positioning_configuration_uncertainty, @@ -1618,7 +1618,7 @@ static const int *hfx_btatt_indoor_positioning_configuration[] = { NULL }; -static const int *hfx_btatt_rsc_measurement_flags[] = { +static int * const hfx_btatt_rsc_measurement_flags[] = { &hf_btatt_rsc_measurement_flags_reserved, &hf_btatt_rsc_measurement_flags_type_of_movement, &hf_btatt_rsc_measurement_flags_total_distance_present, @@ -1626,7 +1626,7 @@ static const int *hfx_btatt_rsc_measurement_flags[] = { NULL }; -static const int *hfx_btatt_cycling_power_measurement_flags[] = { +static int * const hfx_btatt_cycling_power_measurement_flags[] = { &hf_btatt_cycling_power_measurement_flags_reserved, &hf_btatt_cycling_power_measurement_flags_offset_compensation_indicator, &hf_btatt_cycling_power_measurement_flags_accumulated_energy, @@ -1644,20 +1644,20 @@ static const int *hfx_btatt_cycling_power_measurement_flags[] = { NULL }; -static const int *hfx_btatt_cycling_power_measurement_extreme_angles[] = { +static int * const hfx_btatt_cycling_power_measurement_extreme_angles[] = { &hf_btatt_cycling_power_measurement_extreme_angles_maximum, &hf_btatt_cycling_power_measurement_extreme_angles_minimum, NULL }; -static const int *hfx_btatt_csc_measurement_flags[] = { +static int * const hfx_btatt_csc_measurement_flags[] = { &hf_btatt_csc_measurement_flags_reserved, &hf_btatt_csc_measurement_flags_crank_revolution_data, &hf_btatt_csc_measurement_flags_wheel_revolution_data, NULL }; -static const int *hfx_btatt_cycling_power_vector_flags[] = { +static int * const hfx_btatt_cycling_power_vector_flags[] = { &hf_btatt_cycling_power_vector_flags_reserved, &hf_btatt_cycling_power_vector_flags_instantaneous_measurement_direction, &hf_btatt_cycling_power_vector_flags_instantaneous_torque_magnitude_array, @@ -1667,7 +1667,7 @@ static const int *hfx_btatt_cycling_power_vector_flags[] = { NULL }; -static const int *hfx_btatt_cycling_power_control_point_content_mask[] = { +static int * const hfx_btatt_cycling_power_control_point_content_mask[] = { &hf_btatt_cycling_power_control_point_content_mask_reserved, &hf_btatt_cycling_power_control_point_content_mask_accumulated_energy, &hf_btatt_cycling_power_control_point_content_mask_bottom_dead_spot_angle, @@ -1681,7 +1681,7 @@ static const int *hfx_btatt_cycling_power_control_point_content_mask[] = { NULL }; -static const int *hfx_btatt_location_and_speed_flags[] = { +static int * const hfx_btatt_location_and_speed_flags[] = { &hf_btatt_location_and_speed_flags_reserved, &hf_btatt_location_and_speed_flags_heading_source, &hf_btatt_location_and_speed_flags_elevation_source, @@ -1697,7 +1697,7 @@ static const int *hfx_btatt_location_and_speed_flags[] = { NULL }; -static const int *hfx_btatt_navigation_flags[] = { +static int * const hfx_btatt_navigation_flags[] = { &hf_btatt_navigation_flags_reserved, &hf_btatt_navigation_flags_destination_reached, &hf_btatt_navigation_flags_waypoint_reached, @@ -1710,7 +1710,7 @@ static const int *hfx_btatt_navigation_flags[] = { NULL }; -static const int *hfx_btatt_position_quality_flags[] = { +static int * const hfx_btatt_position_quality_flags[] = { &hf_btatt_position_quality_flags_reserved, &hf_btatt_position_quality_flags_position_status, &hf_btatt_position_quality_flags_vdop, @@ -1723,7 +1723,7 @@ static const int *hfx_btatt_position_quality_flags[] = { NULL }; -static const int *hfx_btatt_ln_control_point_content_mask[] = { +static int * const hfx_btatt_ln_control_point_content_mask[] = { &hf_btatt_ln_control_point_content_mask_reserved, &hf_btatt_ln_control_point_content_mask_utc_time, &hf_btatt_ln_control_point_content_mask_rolling_time, @@ -1735,7 +1735,7 @@ static const int *hfx_btatt_ln_control_point_content_mask[] = { NULL }; -static const int *hfx_btatt_body_composition_measurement_flags[] = { +static int * const hfx_btatt_body_composition_measurement_flags[] = { &hf_btatt_body_composition_measurement_flags_reserved, &hf_btatt_body_composition_measurement_flags_multiple_packet_measurement, &hf_btatt_body_composition_measurement_flags_height, @@ -1753,7 +1753,7 @@ static const int *hfx_btatt_body_composition_measurement_flags[] = { NULL }; -static const int *hfx_btatt_weight_measurement_flags[] = { +static int * const hfx_btatt_weight_measurement_flags[] = { &hf_btatt_weight_measurement_flags_reserved, &hf_btatt_weight_measurement_flags_bmi_and_height, &hf_btatt_weight_measurement_flags_user_id, @@ -1762,7 +1762,7 @@ static const int *hfx_btatt_weight_measurement_flags[] = { NULL }; -static const int *hfx_btatt_cgm_measurement_flags[] = { +static int * const hfx_btatt_cgm_measurement_flags[] = { &hf_btatt_cgm_measurement_flags_cgm_trend_information, &hf_btatt_cgm_measurement_flags_cgm_quality, &hf_btatt_cgm_measurement_flags_reserved, @@ -1772,7 +1772,7 @@ static const int *hfx_btatt_cgm_measurement_flags[] = { NULL }; -static const int *hfx_btatt_cgm_sensor_status_annunciation_status[] = { +static int * const hfx_btatt_cgm_sensor_status_annunciation_status[] = { &hf_btatt_cgm_sensor_status_annunciation_status_reserved, &hf_btatt_cgm_sensor_status_annunciation_status_general_device_fault_has_occurred_in_the_sensor, &hf_btatt_cgm_sensor_status_annunciation_status_device_specific_alert, @@ -1783,7 +1783,7 @@ static const int *hfx_btatt_cgm_sensor_status_annunciation_status[] = { NULL }; -static const int *hfx_btatt_cgm_sensor_status_annunciation_cal_temp[] = { +static int * const hfx_btatt_cgm_sensor_status_annunciation_cal_temp[] = { &hf_btatt_cgm_sensor_status_annunciation_cal_temp_reserved, &hf_btatt_cgm_sensor_status_annunciation_cal_temp_sensor_temperature_too_low_for_valid_test_result_at_time_of_measurement, &hf_btatt_cgm_sensor_status_annunciation_cal_temp_sensor_temperature_too_high_for_valid_test_result_at_time_of_measurement, @@ -1794,7 +1794,7 @@ static const int *hfx_btatt_cgm_sensor_status_annunciation_cal_temp[] = { NULL }; -static const int *hfx_btatt_cgm_sensor_status_annunciation_warning[] = { +static int * const hfx_btatt_cgm_sensor_status_annunciation_warning[] = { &hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_device_can_process, &hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_device_can_process, &hf_btatt_cgm_sensor_status_annunciation_warning_sensor_rate_of_increase_exceeded, @@ -1806,7 +1806,7 @@ static const int *hfx_btatt_cgm_sensor_status_annunciation_warning[] = { NULL }; -static const int *hfx_btatt_cgm_feature_feature[] = { +static int * const hfx_btatt_cgm_feature_feature[] = { &hf_btatt_cgm_feature_feature_reserved, &hf_btatt_cgm_feature_feature_quality, &hf_btatt_cgm_feature_feature_trend_information, @@ -1828,13 +1828,13 @@ static const int *hfx_btatt_cgm_feature_feature[] = { NULL }; -static const int *hfx_btatt_cgm_type_and_sample_location[] = { +static int * const hfx_btatt_cgm_type_and_sample_location[] = { &hf_btatt_cgm_type, &hf_btatt_cgm_sample_location, NULL }; -static const int *hfx_btatt_cgm_specific_ops_control_point_calibration_status[] = { +static int * const hfx_btatt_cgm_specific_ops_control_point_calibration_status[] = { &hf_btatt_cgm_specific_ops_control_point_calibration_status_reserved, &hf_btatt_cgm_specific_ops_control_point_calibration_status_pending, &hf_btatt_cgm_specific_ops_control_point_calibration_status_out_of_range, @@ -1842,7 +1842,7 @@ static const int *hfx_btatt_cgm_specific_ops_control_point_calibration_status[] NULL }; -static const int *hfx_btatt_http_data_status[] = { +static int * const hfx_btatt_http_data_status[] = { &hf_btatt_http_data_status_reserved, &hf_btatt_http_data_status_body_truncated, &hf_btatt_http_data_status_body_received, @@ -1851,7 +1851,7 @@ static const int *hfx_btatt_http_data_status[] = { NULL }; -static const int *hfx_btatt_ots_feature_oacp[] = { +static int * const hfx_btatt_ots_feature_oacp[] = { &hf_btatt_ots_feature_oacp_reserved, &hf_btatt_ots_feature_oacp_abort, &hf_btatt_ots_feature_oacp_patching_of_object, @@ -1866,7 +1866,7 @@ static const int *hfx_btatt_ots_feature_oacp[] = { NULL }; -static const int *hfx_btatt_ots_feature_olcp[] = { +static int * const hfx_btatt_ots_feature_olcp[] = { &hf_btatt_ots_feature_olcp_reserved, &hf_btatt_ots_feature_olcp_clear_marking, &hf_btatt_ots_feature_olcp_request_number_of_objects, @@ -1875,7 +1875,7 @@ static const int *hfx_btatt_ots_feature_olcp[] = { NULL }; -static const int *hfx_btatt_ots_properties[] = { +static int * const hfx_btatt_ots_properties[] = { &hf_btatt_ots_properties_reserved, &hf_btatt_ots_properties_mark, &hf_btatt_ots_properties_patch, @@ -1889,7 +1889,7 @@ static const int *hfx_btatt_ots_properties[] = { }; -static const int *hfx_btatt_ots_flags[] = { +static int * const hfx_btatt_ots_flags[] = { &hf_btatt_ots_flags_reserved, &hf_btatt_ots_flags_object_deletion, &hf_btatt_ots_flags_object_creation, @@ -1899,7 +1899,7 @@ static const int *hfx_btatt_ots_flags[] = { NULL }; -static const int *hfx_btatt_plx_spot_check_measurement_flags[] = { +static int * const hfx_btatt_plx_spot_check_measurement_flags[] = { &hf_btatt_plx_spot_check_measurement_flags_reserved, &hf_btatt_plx_spot_check_measurement_flags_device_clock_is_not_set, &hf_btatt_plx_spot_check_measurement_flags_pulse_amplitude_index, @@ -1909,7 +1909,7 @@ static const int *hfx_btatt_plx_spot_check_measurement_flags[] = { NULL }; -static const int *hfx_btatt_plx_measurement_status[] = { +static int * const hfx_btatt_plx_measurement_status[] = { &hf_btatt_plx_measurement_status_invalid_measurement_detected, &hf_btatt_plx_measurement_status_questionable_measurement_detected, &hf_btatt_plx_measurement_status_measurement_unavailable, @@ -1925,7 +1925,7 @@ static const int *hfx_btatt_plx_measurement_status[] = { NULL }; -static const int *hfx_btatt_plx_device_and_sensor_status[] = { +static int * const hfx_btatt_plx_device_and_sensor_status[] = { &hf_btatt_plx_device_and_sensor_status_reserved, &hf_btatt_plx_device_and_sensor_status_sensor_disconnected, &hf_btatt_plx_device_and_sensor_status_sensor_malfunctioning, @@ -1946,7 +1946,7 @@ static const int *hfx_btatt_plx_device_and_sensor_status[] = { NULL }; -static const int *hfx_btatt_plx_continuous_measurement_flags[] = { +static int * const hfx_btatt_plx_continuous_measurement_flags[] = { &hf_btatt_plx_continuous_measurement_flags_reserved, &hf_btatt_plx_continuous_measurement_flags_pulse_amplitude_index, &hf_btatt_plx_continuous_measurement_flags_device_and_sensor_status, @@ -1956,7 +1956,7 @@ static const int *hfx_btatt_plx_continuous_measurement_flags[] = { NULL }; -static const int *hfx_btatt_plx_features_supported_features[] = { +static int * const hfx_btatt_plx_features_supported_features[] = { &hf_btatt_plx_features_supported_features_reserved, &hf_btatt_plx_features_supported_features_multiple_bonds, &hf_btatt_plx_features_supported_features_pulse_amplitude_index, @@ -1969,7 +1969,7 @@ static const int *hfx_btatt_plx_features_supported_features[] = { NULL }; -static const int *hfx_btgatt_microbit_ad_pins[] = { +static int * const hfx_btgatt_microbit_ad_pins[] = { &hf_gatt_microbit_ad_pin0, &hf_gatt_microbit_ad_pin1, &hf_gatt_microbit_ad_pin2, @@ -1993,7 +1993,7 @@ static const int *hfx_btgatt_microbit_ad_pins[] = { NULL }; -static const int *hfx_btgatt_microbit_io_pins[] = { +static int * const hfx_btgatt_microbit_io_pins[] = { &hf_gatt_microbit_io_pin0, &hf_gatt_microbit_io_pin1, &hf_gatt_microbit_io_pin2, @@ -2017,13 +2017,13 @@ static const int *hfx_btgatt_microbit_io_pins[] = { NULL }; -static const int *hfx_btatt_timezone_information[] = { +static int * const hfx_btatt_timezone_information[] = { &hf_btatt_timezone_information_information, &hf_btatt_timezone_information_information_type, NULL }; -static const int *hfx_btatt_battery_power_state[] = { +static int * const hfx_btatt_battery_power_state[] = { &hf_btatt_battery_power_state_present, &hf_btatt_battery_power_state_discharging, &hf_btatt_battery_power_state_charging, @@ -2031,19 +2031,19 @@ static const int *hfx_btatt_battery_power_state[] = { NULL }; -static const int *hfx_btatt_removable[] = { +static int * const hfx_btatt_removable[] = { &hf_btatt_removable_reserved, &hf_btatt_removable_removable, NULL }; -static const int *hfx_btatt_service_required[] = { +static int * const hfx_btatt_service_required[] = { &hf_btatt_service_required_reserved, &hf_btatt_service_required_service_required, NULL }; -static const int *hfx_btatt_fitness_machine_features[] = { +static int * const hfx_btatt_fitness_machine_features[] = { &hf_btatt_fitness_machine_features_reserved, &hf_btatt_fitness_machine_features_user_data_retention, &hf_btatt_fitness_machine_features_force_on_belt_and_power_output, @@ -2065,7 +2065,7 @@ static const int *hfx_btatt_fitness_machine_features[] = { NULL }; -static const int *hfx_btatt_target_setting_features[] = { +static int * const hfx_btatt_target_setting_features[] = { &hf_btatt_target_setting_features_reserved, &hf_btatt_target_setting_features_targeted_cadence_configuration, &hf_btatt_target_setting_features_spin_down_control, @@ -2087,7 +2087,7 @@ static const int *hfx_btatt_target_setting_features[] = { NULL }; -static const int *hfx_btatt_training_status_flags[] = { +static int * const hfx_btatt_training_status_flags[] = { &hf_btatt_training_status_flags_reserved, &hf_btatt_training_status_flags_extended_string, &hf_btatt_training_status_flags_training_status_string, @@ -4630,7 +4630,7 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * guint32 operand_offset; guint32 interface_id; guint32 adapter_id; - const gint **hfs; + int * const *hfs; bluetooth_data_t *bluetooth_data = NULL; tvb = tvb_new_subset_length_caplen(old_tvb, old_offset, length, length); diff --git a/epan/dissectors/packet-btbredr_rf.c b/epan/dissectors/packet-btbredr_rf.c index 1c910d44f0..8fcdae55b9 100644 --- a/epan/dissectors/packet-btbredr_rf.c +++ b/epan/dissectors/packet-btbredr_rf.c @@ -92,7 +92,7 @@ static int hf_data = -1; #define FLAGS_SIGNAL_POWER_VALID 0x0002 #define FLAGS_PACKET_HEADER_AND_BR_EDR_PAYLOAD_DEWHITENED 0x0001 -static const int *hfx_payload_transport_rate[] = { +static int * const hfx_payload_transport_rate[] = { &hf_payload_transport_rate_payload, &hf_payload_transport_rate_transport, NULL diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 0554694651..c922b91cb8 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -612,7 +612,7 @@ static int hf_bthci_cmd_authenticated_payload_timeout = -1; static int hf_bthci_cmd_extended_inquiry_length = -1; -static const int *hfx_bthci_cmd_le_event_mask[] = { +static int * const hfx_bthci_cmd_le_event_mask[] = { &hf_bthci_cmd_le_event_mask_le_reserved, &hf_bthci_cmd_le_event_mask_le_biginfo_advertising_report, &hf_bthci_cmd_le_event_mask_le_transmit_power_reporting, @@ -651,7 +651,7 @@ static const int *hfx_bthci_cmd_le_event_mask[] = { NULL }; -static const int *hfx_bthci_cmd_adv_properties[] = { +static int * const hfx_bthci_cmd_adv_properties[] = { &hf_bthci_cmd_advertising_properties_reserved, &hf_bthci_cmd_advertising_properties_incl_txpower, &hf_bthci_cmd_advertising_properties_anonymous_adv, @@ -663,20 +663,20 @@ static const int *hfx_bthci_cmd_adv_properties[] = { NULL }; -static const int *hfx_bthci_cmd_periodic_adv_properties[] = { +static int * const hfx_bthci_cmd_periodic_adv_properties[] = { &hf_bthci_cmd_periodic_advertising_properties_reserved, &hf_bthci_cmd_advertising_properties_incl_txpower, NULL }; -static const int *hfx_btcmd_all_phys[] = { +static int * const hfx_btcmd_all_phys[] = { &hf_bthci_cmd_all_phys_reserved, &hf_bthci_cmd_all_phys_rx_pref, &hf_bthci_cmd_all_phys_tx_pref, NULL }; -static const int *hfx_btcmd_phys_pref[] = { +static int * const hfx_btcmd_phys_pref[] = { &hf_bthci_cmd_phys_pref_reserved, &hf_bthci_cmd_phys_pref_le_coded, &hf_bthci_cmd_phys_pref_le_2m, @@ -684,20 +684,20 @@ static const int *hfx_btcmd_phys_pref[] = { NULL }; -static const int *hfx_btcmd_phy_options[] = { +static int * const hfx_btcmd_phy_options[] = { &hf_bthci_cmd_phy_options_reserved, &hf_bthci_cmd_phy_options_coding, NULL }; -static const int *hfx_btcmd_le_scan_phys[] = { +static int * const hfx_btcmd_le_scan_phys[] = { &hf_bthci_cmd_le_scan_phys_reserved, &hf_bthci_cmd_le_scan_phys_le_coded, &hf_bthci_cmd_le_scan_phys_le_1m, NULL }; -static const int *hfx_btcmd_le_phys[] = { +static int * const hfx_btcmd_le_phys[] = { &hf_bthci_cmd_le_phys_reserved, &hf_bthci_cmd_le_phys_le_coded, &hf_bthci_cmd_le_phys_le_2m, @@ -705,7 +705,7 @@ static const int *hfx_btcmd_le_phys[] = { NULL }; -static const int *hfx_btcmd_sync_cte_type[] = { +static int * const hfx_btcmd_sync_cte_type[] = { &hf_bthci_cmd_sync_cte_type_reserved, &hf_bthci_cmd_sync_cte_type_sync_only_with_cte, &hf_bthci_cmd_sync_cte_type_no_sync_aod_2us, @@ -714,7 +714,7 @@ static const int *hfx_btcmd_sync_cte_type[] = { NULL }; -static const int *hfx_btcmd_cte_types[] = { +static int * const hfx_btcmd_cte_types[] = { &hf_bthci_cmd_cte_types_reserved, &hf_bthci_cmd_cte_types_aod_2us, &hf_bthci_cmd_cte_types_aod_1us, @@ -722,7 +722,7 @@ static const int *hfx_btcmd_cte_types[] = { NULL }; -static const int *hfx_bthci_cmd_sco_packet_type[] = { +static int * const hfx_bthci_cmd_sco_packet_type[] = { &hf_bthci_cmd_sco_packet_type_reserved, &hf_bthci_cmd_sco_packet_type_3ev5, &hf_bthci_cmd_sco_packet_type_2ev5, @@ -737,7 +737,7 @@ static const int *hfx_bthci_cmd_sco_packet_type[] = { NULL }; -static const int *hfx_bthci_cmd_packet_type[] = { +static int * const hfx_bthci_cmd_packet_type[] = { &hf_bthci_cmd_packet_type_dh5, &hf_bthci_cmd_packet_type_dm5, &hf_bthci_cmd_packet_type_3dh5, @@ -971,7 +971,7 @@ static gint hf_btcommon_eir_ad_mesh_msg = -1; static gint hf_btcommon_eir_ad_mesh_pbadv = -1; static gint hf_btcommon_eir_ad_mesh_beacon = -1; -static const int *hfx_btcommon_eir_ad_ips_flags[] = { +static int * const hfx_btcommon_eir_ad_ips_flags[] = { &hf_btcommon_eir_ad_ips_flags_reserved, &hf_btcommon_eir_ad_ips_flags_location_name, &hf_btcommon_eir_ad_ips_flags_uncertainty, @@ -983,7 +983,7 @@ static const int *hfx_btcommon_eir_ad_ips_flags[] = { NULL }; -static const int *hfx_btcommon_eir_ad_ips_uncertainty[] = { +static int * const hfx_btcommon_eir_ad_ips_uncertainty[] = { &hf_btcommon_eir_ad_ips_uncertainty_reserved, &hf_btcommon_eir_ad_ips_uncertainty_precision, &hf_btcommon_eir_ad_ips_uncertainty_update_time, @@ -991,7 +991,7 @@ static const int *hfx_btcommon_eir_ad_ips_uncertainty[] = { NULL }; -static const int *hfx_btcommon_eir_ad_tds_flags[] = { +static int * const hfx_btcommon_eir_ad_tds_flags[] = { &hf_btcommon_eir_ad_tds_flags_reserved, &hf_btcommon_eir_ad_tds_flags_transport_state, &hf_btcommon_eir_ad_tds_flags_transport_data_incomplete, @@ -999,7 +999,7 @@ static const int *hfx_btcommon_eir_ad_tds_flags[] = { NULL }; -static const int *hfx_btcommon_eir_ad_le_features_0[] = { +static int * const hfx_btcommon_eir_ad_le_features_0[] = { &hf_btcommon_eir_ad_le_features_encryption, &hf_btcommon_eir_ad_le_features_connection_parameters_request_procedure, &hf_btcommon_eir_ad_le_features_extended_reject_indication, @@ -1011,7 +1011,7 @@ static const int *hfx_btcommon_eir_ad_le_features_0[] = { NULL }; -static const int *hfx_btcommon_eir_ad_le_features_1[] = { +static int * const hfx_btcommon_eir_ad_le_features_1[] = { &hf_btcommon_eir_ad_le_features_2m_phy, &hf_btcommon_eir_ad_le_features_stable_modulation_index_tx, &hf_btcommon_eir_ad_le_features_stable_modulation_index_rx, @@ -1023,18 +1023,18 @@ static const int *hfx_btcommon_eir_ad_le_features_1[] = { NULL }; -static const int *hfx_btcommon_eir_ad_le_features_2[] = { +static int * const hfx_btcommon_eir_ad_le_features_2[] = { &hf_btcommon_eir_ad_le_features_minimum_number_of_used_channels_procedure, &hf_btcommon_eir_ad_le_features_reserved_1_7, NULL }; -static const int *hfx_btcommon_eir_ad_le_features_reserved[] = { +static int * const hfx_btcommon_eir_ad_le_features_reserved[] = { &hf_btcommon_eir_ad_le_features_reserved, NULL }; -static const int **hfx_btcommon_eir_ad_le_features[] = { +static int * const *hfx_btcommon_eir_ad_le_features[] = { hfx_btcommon_eir_ad_le_features_0, hfx_btcommon_eir_ad_le_features_1, hfx_btcommon_eir_ad_le_features_2, diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index adf2625675..fa0b9f3a20 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -575,7 +575,7 @@ static int hf_packet_type_sco_hv2 = -1; static int hf_packet_type_sco_hv1 = -1; static int hf_packet_type_sco_reserved_4_0 = -1; -static const int *hfx_bthci_evt_le_features[] = { +static int * const hfx_bthci_evt_le_features[] = { &hf_bthci_evt_le_features_encryption, &hf_bthci_evt_le_features_connection_parameters_request_procedure, &hf_bthci_evt_le_features_extended_reject_indication, @@ -616,7 +616,7 @@ static const int *hfx_bthci_evt_le_features[] = { NULL }; -static const int *hfx_packet_type_acl[] = { +static int * const hfx_packet_type_acl[] = { &hf_packet_type_acl_dh5, &hf_packet_type_acl_dm5, &hf_packet_type_acl_3dh5, @@ -634,7 +634,7 @@ static const int *hfx_packet_type_acl[] = { NULL }; -static const int *hfx_packet_type_sco[] = { +static int * const hfx_packet_type_sco[] = { &hf_packet_type_sco_reserved_15_8, &hf_packet_type_sco_hv3, &hf_packet_type_sco_hv2, @@ -666,7 +666,7 @@ static int hf_bthci_evt_ext_advts_event_type_legacy = -1; static int hf_bthci_evt_ext_advts_event_type_data_status = -1; static int hf_bthci_evt_ext_advts_event_type_reserved = -1; -static const int *hfx_bthci_evt_le_ext_advts_evt_type[] = { +static int * const hfx_bthci_evt_le_ext_advts_evt_type[] = { &hf_bthci_evt_ext_advts_event_type_connectable, &hf_bthci_evt_ext_advts_event_type_scannable, &hf_bthci_evt_ext_advts_event_type_directed, @@ -683,7 +683,7 @@ static int hf_bthci_evt_supported_switching_sample_rates_1us_sampling_aod_rx = - static int hf_bthci_evt_supported_switching_sample_rates_1us_switching_and_sampling_aoa_rx = -1; static int hf_bthci_evt_supported_switching_sample_rates_reserved = -1; -static const int *hfx_bthci_evt_supported_switching_sample_rates[] = { +static int * const hfx_bthci_evt_supported_switching_sample_rates[] = { &hf_bthci_evt_supported_switching_sample_rates_1us_switching_aod_tx, &hf_bthci_evt_supported_switching_sample_rates_1us_sampling_aod_rx, &hf_bthci_evt_supported_switching_sample_rates_1us_switching_and_sampling_aoa_rx, @@ -695,7 +695,7 @@ static int hf_bthci_evt_simple_pairing_options = -1; static int hf_bthci_evt_simple_pairing_options_remote_public_key_validation = -1; static int hf_bthci_evt_simple_pairing_options_reserved = -1; -static const int *hfx_bthci_evt_simple_pairing_options[] = { +static int * const hfx_bthci_evt_simple_pairing_options[] = { &hf_bthci_evt_simple_pairing_options_remote_public_key_validation, &hf_bthci_evt_simple_pairing_options_reserved, NULL @@ -706,7 +706,7 @@ static int hf_bthci_evt_transmit_power_level_flags_minimum_power = -1; static int hf_bthci_evt_transmit_power_level_flags_maximum_power = -1; static int hf_bthci_evt_transmit_power_level_flags_reserved = -1; -static const int *hfx_bthci_evt_transmit_power_level_flags[] = { +static int * const hfx_bthci_evt_transmit_power_level_flags[] = { &hf_bthci_evt_transmit_power_level_flags_minimum_power, &hf_bthci_evt_transmit_power_level_flags_maximum_power, &hf_bthci_evt_transmit_power_level_flags_reserved, diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c index 7d0f7e5da3..84fc995321 100644 --- a/epan/dissectors/packet-bthci_vendor.c +++ b/epan/dissectors/packet-bthci_vendor.c @@ -114,7 +114,7 @@ static int hf_broadcom_build_base = -1; static int hf_broadcom_build_number = -1; static int hf_broadcom_data = -1; -static const int *hfx_le_multi_advertising_channel_map[] = { +static int * const hfx_le_multi_advertising_channel_map[] = { &hf_broadcom_le_multi_advertising_channel_map_reserved, &hf_broadcom_le_multi_advertising_channel_map_39, &hf_broadcom_le_multi_advertising_channel_map_38, @@ -1608,14 +1608,14 @@ static int hf_intel_set_event_mask_sco_rejected_via_lmp = -1; static int hf_intel_set_event_mask_bootup = -1; static int hf_intel_data = -1; -static const int *hfx_intel_scan_status[] = { +static int * const hfx_intel_scan_status[] = { &hf_intel_scan_status_reserved, &hf_intel_scan_status_page_scan, &hf_intel_scan_status_inquiry_scan, NULL }; -static const int *hfx_intel_set_event_mask[] = { +static int * const hfx_intel_set_event_mask[] = { &hf_intel_set_event_mask_reserved_15_63, &hf_intel_set_event_mask_firmware_trace_string, &hf_intel_set_event_mask_le_link_established, diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 62bf84018e..1844323657 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -780,7 +780,7 @@ dissect_brsf_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, value = get_uint_parameter(parameter_stream, parameter_length); if (role == ROLE_HS) { - static const int * hs[] = { + static int * const hs[] = { &hf_brsf_hs_ec_nr_function, &hf_brsf_hs_call_waiting_or_tree_way, &hf_brsf_hs_cli_presentation, @@ -800,7 +800,7 @@ dissect_brsf_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, expert_add_info(pinfo, pitem, &ei_brfs_hs_reserved_bits); } } else { - static const int * ag[] = { + static int * const ag[] = { &hf_brsf_ag_three_way_calling, &hf_brsf_ag_ec_nr_function, &hf_brsf_ag_voice_recognition_function, @@ -1111,7 +1111,7 @@ dissect_xapl_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_xapl_host_info, tvb, offset, parameter_length, ENC_NA | ENC_ASCII); } } else if (parameter_number == 1) { - static const int * hfx[] = { + static int * const hfx[] = { &hf_xapl_features_reserved_x, &hf_xapl_features_noise_reduction_status_reporting, &hf_xapl_features_siri_status_reporting, diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 017f924508..d3df0708b5 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -215,7 +215,7 @@ static gint ett_extended_advertising_aux_pointer = -1; static gint ett_extended_advertising_sync_info = -1; static gint ett_extended_advertising_acad = -1; -static const int *hfx_extended_advertising_flags[] = { +static int * const hfx_extended_advertising_flags[] = { &hf_extended_advertising_flags_adva, &hf_extended_advertising_flags_targeta, &hf_extended_advertising_flags_cteinfo, @@ -227,7 +227,7 @@ static const int *hfx_extended_advertising_flags[] = { NULL }; -static const int *hfx_control_feature_set_1[] = { +static int * const hfx_control_feature_set_1[] = { &hf_control_feature_set_le_encryption, &hf_control_feature_set_connection_parameters_request_procedure, &hf_control_feature_set_extended_reject_indication, @@ -239,7 +239,7 @@ static const int *hfx_control_feature_set_1[] = { NULL }; -static const int *hfx_control_feature_set_2[] = { +static int * const hfx_control_feature_set_2[] = { &hf_control_feature_set_le_2m_phy, &hf_control_feature_set_stable_modulation_index_transmitter, &hf_control_feature_set_stable_modulation_index_receiver, @@ -251,13 +251,13 @@ static const int *hfx_control_feature_set_2[] = { NULL }; -static const int *hfx_control_feature_set_3[] = { +static int * const hfx_control_feature_set_3[] = { &hf_control_feature_set_minimum_number_of_used_channels_procedure, &hf_control_feature_set_reserved_bits, NULL }; -static const int *hfx_control_phys_sender[] = { +static int * const hfx_control_phys_sender[] = { &hf_control_phys_sender_le_1m_phy, &hf_control_phys_sender_le_2m_phy, &hf_control_phys_sender_le_coded_phy, @@ -265,7 +265,7 @@ static const int *hfx_control_phys_sender[] = { NULL }; -static const int *hfx_control_phys_update[] = { +static int * const hfx_control_phys_update[] = { &hf_control_phys_update_le_1m_phy, &hf_control_phys_update_le_2m_phy, &hf_control_phys_update_le_coded_phy, @@ -273,7 +273,7 @@ static const int *hfx_control_phys_update[] = { NULL }; -static const int *hfx_control_phys[] = { +static int * const hfx_control_phys[] = { &hf_control_phys_le_1m_phy, &hf_control_phys_le_2m_phy, &hf_control_phys_le_coded_phy, diff --git a/epan/dissectors/packet-btle_rf.c b/epan/dissectors/packet-btle_rf.c index f48325f61f..4c48d89b6f 100644 --- a/epan/dissectors/packet-btle_rf.c +++ b/epan/dissectors/packet-btle_rf.c @@ -56,7 +56,7 @@ static int hf_btle_rf_mic_checked_flag = -1; static int hf_btle_rf_mic_valid_flag = -1; static int hf_btle_rf_flags_rfu_2 = -1; -static const int *hfs_btle_rf_flags[] = { +static int * const hfs_btle_rf_flags[] = { &hf_btle_rf_dewhitened_flag, &hf_btle_rf_sigpower_valid_flag, &hf_btle_rf_noisepower_valid_flag, diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index 656335f71e..8070ff01a1 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -1095,7 +1095,7 @@ static const value_string btmesh_fault_array_vals[] = { #if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */ -static const int *config_composition_data_status_features_headers[] = { +static int * const config_composition_data_status_features_headers[] = { &hf_btmesh_config_composition_data_status_features_relay, &hf_btmesh_config_composition_data_status_features_proxy, &hf_btmesh_config_composition_data_status_features_friend, @@ -1104,7 +1104,7 @@ static const int *config_composition_data_status_features_headers[] = { NULL }; -static const int *config_heartbeat_publication_set_features_headers[] = { +static int * const config_heartbeat_publication_set_features_headers[] = { &hf_btmesh_config_heartbeat_publication_set_features_relay, &hf_btmesh_config_heartbeat_publication_set_features_proxy, &hf_btmesh_config_heartbeat_publication_set_features_friend, @@ -1113,7 +1113,7 @@ static const int *config_heartbeat_publication_set_features_headers[] = { NULL }; -static const int *config_heartbeat_publication_status_features_headers[] = { +static int * const config_heartbeat_publication_status_features_headers[] = { &hf_btmesh_config_heartbeat_publication_status_features_relay, &hf_btmesh_config_heartbeat_publication_status_features_proxy, &hf_btmesh_config_heartbeat_publication_status_features_friend, diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 25eaa86c82..1043613c17 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -438,7 +438,7 @@ static gint ett_btsdp_supported_features_mdep_role = -1; static gint ett_btsdp_supported_features_mdep_description = -1; static gint ett_btsdp_protocol = -1; -static const int *hfx_ctn_supported_features[] = { +static int * const hfx_ctn_supported_features[] = { &hf_ctn_supported_features_reserved, &hf_ctn_supported_features_forward, &hf_ctn_supported_features_delete, @@ -450,7 +450,7 @@ static const int *hfx_ctn_supported_features[] = { NULL }; -static const int *hfx_mps_mpsd_scenarios[] = { +static int * const hfx_mps_mpsd_scenarios[] = { &hf_mps_mpsd_scenarios_reserved, &hf_mps_mpsd_scenarios_37, &hf_mps_mpsd_scenarios_36, @@ -493,7 +493,7 @@ static const int *hfx_mps_mpsd_scenarios[] = { NULL }; -static const int *hfx_mps_mpmd_scenarios[] = { +static int * const hfx_mps_mpmd_scenarios[] = { &hf_mps_mpmd_scenarios_reserved, &hf_mps_mpmd_scenarios_18, &hf_mps_mpmd_scenarios_17, @@ -517,7 +517,7 @@ static const int *hfx_mps_mpmd_scenarios[] = { NULL }; -static const int *hfx_mps_supported_profile_and_protocol_dependency[] = { +static int * const hfx_mps_supported_profile_and_protocol_dependency[] = { &hf_mps_supported_profile_and_protocol_dependency_reserved, &hf_mps_supported_profile_and_protocol_dependency_dis_connection_order_behaviour, &hf_mps_supported_profile_and_protocol_dependency_gavdp_requirements, @@ -525,7 +525,7 @@ static const int *hfx_mps_supported_profile_and_protocol_dependency[] = { NULL }; -static const int *hfx_map_supported_features[] = { +static int * const hfx_map_supported_features[] = { &hf_map_supported_features_reserved, &hf_map_supported_features_extended_event_report_1_1, &hf_map_supported_features_instance_information_feature, @@ -537,7 +537,7 @@ static const int *hfx_map_supported_features[] = { NULL }; -static const int *hfx_pbap_pse_supported_repositories[] = { +static int * const hfx_pbap_pse_supported_repositories[] = { &hf_pbap_pse_supported_repositories_reserved, &hf_pbap_pse_supported_repositories_favourites, &hf_pbap_pse_supported_repositories_speed_dial, @@ -546,7 +546,7 @@ static const int *hfx_pbap_pse_supported_repositories[] = { NULL }; -static const int *hfx_pbap_pse_supported_features[] = { +static int * const hfx_pbap_pse_supported_features[] = { &hf_pbap_pse_supported_features_reserved, &hf_pbap_pse_supported_features_default_contact_image_format, &hf_pbap_pse_supported_features_contact_referencing, diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c index a78e08c27d..71f09570c7 100644 --- a/epan/dissectors/packet-btsmp.c +++ b/epan/dissectors/packet-btsmp.c @@ -54,7 +54,7 @@ static int hf_btsmp_public_key_y = -1; static int hf_btsmp_dhkey_check = -1; static int hf_btsmp_notification_type = -1; -static const int *hfx_btsmp_key_distribution[] = { +static int * const hfx_btsmp_key_distribution[] = { &hf_btsmp_key_dist_reserved, &hf_btsmp_key_dist_linkkey, &hf_btsmp_key_dist_sign, @@ -63,7 +63,7 @@ static const int *hfx_btsmp_key_distribution[] = { NULL }; -static const int *hfx_btsmp_authreq[] = { +static int * const hfx_btsmp_authreq[] = { &hf_btsmp_reserved_flag, &hf_btsmp_keypress_flag, &hf_btsmp_secure_connection_flag, diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 7145904253..0d9f2aca5e 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -121,7 +121,7 @@ static int hf_c1222_epsem_flags_ed_class = -1; static int hf_c1222_epsem_flags_security_modes = -1; static int hf_c1222_epsem_flags_response_control = -1; /* and the structure of the flag components */ -static const int *c1222_flags[] = { +static int * const c1222_flags[] = { &hf_c1222_epsem_flags_reserved, &hf_c1222_epsem_flags_recovery, &hf_c1222_epsem_flags_proxy, diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index 2e7d7580b3..c832ae1bc9 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -107,7 +107,7 @@ static int hf_canopen_time_stamp_days = -1; /* Download segment request (ccs=0) decode mask */ -static const int *sdo_cmd_fields_ccs0[] = { +static int * const sdo_cmd_fields_ccs0[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_toggle, &hf_canopen_sdo_cmd_updown_n, @@ -115,7 +115,7 @@ static const int *sdo_cmd_fields_ccs0[] = { NULL }; /* Initiate download request (ccs=1) decode mask */ -static const int *sdo_cmd_fields_ccs1[] = { +static int * const sdo_cmd_fields_ccs1[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_init_n, &hf_canopen_sdo_cmd_init_e, @@ -123,37 +123,37 @@ static const int *sdo_cmd_fields_ccs1[] = { NULL }; /* Initiate upload request (ccs=2) decode mask */ -static const int *sdo_cmd_fields_ccs2[] = { +static int * const sdo_cmd_fields_ccs2[] = { &hf_canopen_sdo_cmd_ccs, NULL }; /* Download segment request (ccs=3) decode mask */ -static const int *sdo_cmd_fields_ccs3[] = { +static int * const sdo_cmd_fields_ccs3[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_toggle, NULL }; /* */ -static const int *sdo_cmd_fields_ccs4[] = { +static int * const sdo_cmd_fields_ccs4[] = { &hf_canopen_sdo_cmd_ccs, NULL }; /* Block upload (ccs=5,cs=0) decode mask */ -static const int *sdo_cmd_fields_ccs5_subcommand0[] = { +static int * const sdo_cmd_fields_ccs5_subcommand0[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_block_crc_support, &hf_canopen_sdo_cmd_ccs5_subcommand, NULL }; /* Block upload (ccs=5,cs=1,2,3) decode mask */ -static const int *sdo_cmd_fields_ccs5_subcommand1[] = { +static int * const sdo_cmd_fields_ccs5_subcommand1[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_ccs5_subcommand, NULL }; /* Block download (ccs=6,cs=0) decode mask */ -static const int *sdo_cmd_fields_ccs6_subcommand0[] = { +static int * const sdo_cmd_fields_ccs6_subcommand0[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_block_crc_support, &hf_canopen_sdo_cmd_block_s, @@ -161,14 +161,14 @@ static const int *sdo_cmd_fields_ccs6_subcommand0[] = { NULL }; /* Block download (ccs=6,cs=1) decode mask */ -static const int *sdo_cmd_fields_ccs6_subcommand1[] = { +static int * const sdo_cmd_fields_ccs6_subcommand1[] = { &hf_canopen_sdo_cmd_ccs, &hf_canopen_sdo_cmd_block_n, &hf_canopen_sdo_cmd_ccs6_subcommand, NULL }; -static const int **_sdo_cmd_fields_ccs[] = { +static int * const *_sdo_cmd_fields_ccs[] = { sdo_cmd_fields_ccs0, sdo_cmd_fields_ccs1, sdo_cmd_fields_ccs2, @@ -176,20 +176,20 @@ static const int **_sdo_cmd_fields_ccs[] = { sdo_cmd_fields_ccs4, }; -static const int **_sdo_cmd_fields_ccs5[] = { +static int * const *_sdo_cmd_fields_ccs5[] = { sdo_cmd_fields_ccs5_subcommand0, sdo_cmd_fields_ccs5_subcommand1, sdo_cmd_fields_ccs5_subcommand1, sdo_cmd_fields_ccs5_subcommand1 }; -static const int **_sdo_cmd_fields_ccs6[] = { +static int * const *_sdo_cmd_fields_ccs6[] = { sdo_cmd_fields_ccs6_subcommand0, sdo_cmd_fields_ccs6_subcommand1 }; /* Emergency error register decode mask */ -static const int *em_err_reg_fields[] = { +static int * const em_err_reg_fields[] = { &hf_canopen_em_err_reg_ge, &hf_canopen_em_err_reg_cu, &hf_canopen_em_err_reg_vo, @@ -202,7 +202,7 @@ static const int *em_err_reg_fields[] = { }; /* (scs=0) decode mask */ -static const int *sdo_cmd_fields_scs0[] = { +static int * const sdo_cmd_fields_scs0[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_toggle, &hf_canopen_sdo_cmd_updown_n, @@ -210,13 +210,13 @@ static const int *sdo_cmd_fields_scs0[] = { NULL }; /* (scs=1) decode mask */ -static const int *sdo_cmd_fields_scs1[] = { +static int * const sdo_cmd_fields_scs1[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_toggle, NULL }; /* (scs=2) decode mask */ -static const int *sdo_cmd_fields_scs2[] = { +static int * const sdo_cmd_fields_scs2[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_init_n, &hf_canopen_sdo_cmd_init_e, @@ -224,31 +224,31 @@ static const int *sdo_cmd_fields_scs2[] = { NULL }; /* (scs=3) decode mask */ -static const int *sdo_cmd_fields_scs3[] = { +static int * const sdo_cmd_fields_scs3[] = { &hf_canopen_sdo_cmd_scs, NULL }; /* (scs=4) decode mask */ -static const int *sdo_cmd_fields_scs4[] = { +static int * const sdo_cmd_fields_scs4[] = { &hf_canopen_sdo_cmd_scs, NULL }; /* (scs=5,ss=0) decode mask */ -static const int *sdo_cmd_fields_scs5_subcommand0[] = { +static int * const sdo_cmd_fields_scs5_subcommand0[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_block_crc_support, &hf_canopen_sdo_cmd_scs5_subcommand, NULL }; /* (scs=5,ss=1,2) decode mask */ -static const int *sdo_cmd_fields_scs5_subcommand1[] = { +static int * const sdo_cmd_fields_scs5_subcommand1[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_scs5_subcommand, NULL }; /* (scs=6,ss=0) decode mask */ -static const int *sdo_cmd_fields_scs6_subcommand0[] = { +static int * const sdo_cmd_fields_scs6_subcommand0[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_block_crc_support, &hf_canopen_sdo_cmd_block_s, @@ -256,7 +256,7 @@ static const int *sdo_cmd_fields_scs6_subcommand0[] = { NULL }; /* (scs=6,ss=1) decode mask */ -static const int *sdo_cmd_fields_scs6_subcommand1[] = { +static int * const sdo_cmd_fields_scs6_subcommand1[] = { &hf_canopen_sdo_cmd_scs, &hf_canopen_sdo_cmd_block_n, &hf_canopen_sdo_cmd_scs6_subcommand, @@ -264,7 +264,7 @@ static const int *sdo_cmd_fields_scs6_subcommand1[] = { }; -static const int **_sdo_cmd_fields_scs[] = { +static int * const *_sdo_cmd_fields_scs[] = { sdo_cmd_fields_scs0, sdo_cmd_fields_scs1, sdo_cmd_fields_scs2, @@ -272,13 +272,13 @@ static const int **_sdo_cmd_fields_scs[] = { sdo_cmd_fields_scs4 }; -static const int **_sdo_cmd_fields_scs5[] = { +static int * const *_sdo_cmd_fields_scs5[] = { sdo_cmd_fields_scs5_subcommand0, sdo_cmd_fields_scs5_subcommand1, sdo_cmd_fields_scs5_subcommand1, }; -static const int **_sdo_cmd_fields_scs6[] = { +static int * const *_sdo_cmd_fields_scs6[] = { sdo_cmd_fields_scs6_subcommand0, sdo_cmd_fields_scs6_subcommand1 }; @@ -781,7 +781,7 @@ canopen_detect_msg_type(guint function_code, guint node_id) } -static inline const int ** +static inline int * const * sdo_cmd_fields_scs(guint cs, guint subcommand) { if (cs < array_length(_sdo_cmd_fields_scs)) @@ -793,7 +793,7 @@ sdo_cmd_fields_scs(guint cs, guint subcommand) return NULL; } -static inline const int ** +static inline int * const * sdo_cmd_fields_ccs(guint cs, guint subcommand) { if (cs < array_length(_sdo_cmd_fields_ccs)) @@ -815,7 +815,7 @@ dissect_sdo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *canopen_type_tree, gu guint8 sdo_mux = 0, sdo_pst = 0; /*sdo values used to choose dissector*/ guint8 sdo_cs = 0, sdo_subcommand = 0; - const gint **sdo_cmd_fields; + int * const *sdo_cmd_fields; /* get SDO command specifier */ sdo_cs = tvb_get_bits8(tvb, 0, 3); diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 6b714b15ac..70beddfcb6 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -598,7 +598,7 @@ static expert_field ei_capwap_fortinet_mac_len = EI_INIT; static expert_field ei_capwap_message_element_fortinet_type = EI_INIT; static expert_field ei_capwap_message_element_cisco_type = EI_INIT; -static const int *ieee80211_ofdm_control_band_support_flags[] = { +static int * const ieee80211_ofdm_control_band_support_flags[] = { &hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit0, &hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit1, &hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit2, @@ -610,28 +610,28 @@ static const int *ieee80211_ofdm_control_band_support_flags[] = { NULL }; -static const int *ieee80211_ie_flags[] = { +static int * const ieee80211_ie_flags[] = { &hf_capwap_msg_element_type_ieee80211_ie_flags_b, &hf_capwap_msg_element_type_ieee80211_ie_flags_p, &hf_capwap_msg_element_type_ieee80211_ie_flags_rsv, NULL }; -static const int *capwap_ac_descriptor_security_flags[] = { +static int * const capwap_ac_descriptor_security_flags[] = { &hf_capwap_msg_element_type_ac_descriptor_security_r, &hf_capwap_msg_element_type_ac_descriptor_security_s, &hf_capwap_msg_element_type_ac_descriptor_security_x, NULL }; -static const int *capwap_ac_descriptor_dtls_flags[] = { +static int * const capwap_ac_descriptor_dtls_flags[] = { &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_r, &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_d, &hf_capwap_msg_element_type_ac_descriptor_dtls_policy_c, NULL }; -static const int *capwap_wtp_frame_tunnel_mode_flags[] = { +static int * const capwap_wtp_frame_tunnel_mode_flags[] = { &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_n, &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_e, &hf_capwap_msg_element_type_wtp_frame_tunnel_mode_l, @@ -639,7 +639,7 @@ static const int *capwap_wtp_frame_tunnel_mode_flags[] = { NULL }; -static int const *ieee80211_add_wlan_capability_flags[] = { +static int * const ieee80211_add_wlan_capability_flags[] = { &hf_capwap_msg_element_type_ieee80211_add_wlan_capability_e, &hf_capwap_msg_element_type_ieee80211_add_wlan_capability_i, &hf_capwap_msg_element_type_ieee80211_add_wlan_capability_c, @@ -659,7 +659,7 @@ static int const *ieee80211_add_wlan_capability_flags[] = { NULL }; -static const int *ieee80211_station_capabilities_flags[] ={ +static int * const ieee80211_station_capabilities_flags[] ={ &hf_capwap_msg_element_type_ieee80211_station_capabilities_e, &hf_capwap_msg_element_type_ieee80211_station_capabilities_i, &hf_capwap_msg_element_type_ieee80211_station_capabilities_c, @@ -679,7 +679,7 @@ static const int *ieee80211_station_capabilities_flags[] ={ NULL }; -static const int * ieee80211_update_wlan_capability_flags[] = { +static int * const ieee80211_update_wlan_capability_flags[] = { &hf_capwap_msg_element_type_ieee80211_update_wlan_capability_e, &hf_capwap_msg_element_type_ieee80211_update_wlan_capability_i, &hf_capwap_msg_element_type_ieee80211_update_wlan_capability_c, diff --git a/epan/dissectors/packet-cattp.c b/epan/dissectors/packet-cattp.c index deddcd36fb..d1533ea392 100644 --- a/epan/dissectors/packet-cattp.c +++ b/epan/dissectors/packet-cattp.c @@ -57,7 +57,7 @@ static int hf_cattp_flag_seg = -1; static int hf_cattp_version = -1; /* structure of flag components */ -static const int *cattp_flags[] = { +static int * const cattp_flags[] = { &hf_cattp_flag_syn, &hf_cattp_flag_ack, &hf_cattp_flag_eak, diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index b342cbc68a..131bde066d 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -308,7 +308,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U guint16 checkword_field = 0; guint16 checkword_sum = 0; tvbuff_t *next_tvb; - static const int * header_flags[] = { + static int * const header_flags[] = { &hf_ccsds_version, &hf_ccsds_type, &hf_ccsds_secheader, diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 2af328472f..50ff320f83 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -2096,7 +2096,7 @@ static guint c_dissect_features(proto_tree *tree, tvbuff_t *tvb, guint off, c_pkt_data *data _U_) { - static const int *lowword[] = { + static int * const lowword[] = { &hf_feature_uid, &hf_feature_nosrcaddr, &hf_feature_monclockcheck, @@ -2131,7 +2131,7 @@ guint c_dissect_features(proto_tree *tree, &hf_feature_mon_single_paxos, NULL }; - static const int *highword[] = { + static int * const highword[] = { &hf_feature_osd_snapmapper, &hf_feature_mon_scrub, &hf_feature_osd_packed_recovery, @@ -2168,7 +2168,7 @@ static guint c_dissect_flags(proto_tree *tree, tvbuff_t *tvb, guint off, c_pkt_data *data _U_) { - static const int *flags[] = { + static int * const flags[] = { &hf_flag_lossy, NULL }; @@ -2206,7 +2206,7 @@ static guint c_dissect_osd_flags(proto_tree *tree, tvbuff_t *tvb, guint off, c_pkt_data *data _U_) { - static const int *flags[] = { + static int * const flags[] = { &hf_osd_flag_ack, &hf_osd_flag_onnvram, &hf_osd_flag_ondisk, @@ -2678,13 +2678,13 @@ guint c_dissect_pgpool(proto_tree *root, c_pgpool_type type; c_pgpool_cachemode cachemode; - static const int *flags_low[] = { + static int * const flags_low[] = { &hf_pgpool_flag_hashpool, &hf_pgpool_flag_full, &hf_pgpool_flag_fake_ec_pool, NULL }; - static const int *flags_high[] = { + static int * const flags_high[] = { NULL }; diff --git a/epan/dissectors/packet-cesoeth.c b/epan/dissectors/packet-cesoeth.c index a3ac3b62da..b3d109c928 100644 --- a/epan/dissectors/packet-cesoeth.c +++ b/epan/dissectors/packet-cesoeth.c @@ -43,7 +43,7 @@ static gint ett_cesoeth_cw = -1; static expert_field ei_cesoeth_reserved = EI_INIT; static expert_field ei_cesoeth_length = EI_INIT; -static const int* cesoeth_l0_cw[] = +static int* const cesoeth_l0_cw[] = { &hf_cesoeth_cw_reserved1, &hf_cesoeth_cw_l, @@ -55,7 +55,7 @@ static const int* cesoeth_l0_cw[] = NULL }; -static const int* cesoeth_l1_cw[] = +static int* const cesoeth_l1_cw[] = { &hf_cesoeth_cw_reserved1, &hf_cesoeth_cw_l, diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c index 37970e9a82..7df42090ab 100644 --- a/epan/dissectors/packet-cfdp.c +++ b/epan/dissectors/packet-cfdp.c @@ -457,7 +457,7 @@ static const value_string cfdp_directive_codes[] = { { 0, NULL } }; -static const int *cfdp_flags[] = { +static int * const cfdp_flags[] = { &hf_cfdp_version, &hf_cfdp_pdu_type, &hf_cfdp_direction, @@ -467,7 +467,7 @@ static const int *cfdp_flags[] = { NULL }; -static const int *cfdp_byte2[] = { +static int * const cfdp_byte2[] = { &hf_cfdp_res2, &hf_cfdp_entid_length, &hf_cfdp_res3, @@ -475,25 +475,25 @@ static const int *cfdp_byte2[] = { NULL }; -static const int *cfdp_proxy_fault_hdl_overr[] = { +static int * const cfdp_proxy_fault_hdl_overr[] = { &hf_cfdp_condition_code, &hf_cfdp_handler_code, NULL }; -static const int *cfdp_proxy_trans_mode [] = { +static int * const cfdp_proxy_trans_mode [] = { &hf_cfdp_spare_seven_2, &hf_cfdp_trans_mode, NULL }; -static const int *cfdp_proxy_segment_control_byte [] = { +static int * const cfdp_proxy_segment_control_byte [] = { &hf_cfdp_spare_seven_2, &hf_cfdp_proxy_segment_control, NULL }; -static const int *cfdp_proxy_put_resp [] = { +static int * const cfdp_proxy_put_resp [] = { &hf_cfdp_condition_code, &hf_cfdp_spare_one, &hf_cfdp_condition_code, @@ -502,7 +502,7 @@ static const int *cfdp_proxy_put_resp [] = { NULL }; -static const int *cfdp_orig_trans_id[] = { +static int * const cfdp_orig_trans_id[] = { &hf_cfdp_res2, &hf_cfdp_entid_length, &hf_cfdp_res3, @@ -510,7 +510,7 @@ static const int *cfdp_orig_trans_id[] = { NULL }; -static const int *cfdp_remote_stat_rep_req[] = { +static int * const cfdp_remote_stat_rep_req[] = { &hf_cfdp_res2, &hf_cfdp_entid_length, &hf_cfdp_res3, @@ -518,7 +518,7 @@ static const int *cfdp_remote_stat_rep_req[] = { NULL }; -static const int *cfdp_remote_stat_rep_resp[] = { +static int * const cfdp_remote_stat_rep_resp[] = { &hf_cfdp_trans_stat, &hf_cfdp_spare_five, &hf_cfdp_rep_resp_code, @@ -529,7 +529,7 @@ static const int *cfdp_remote_stat_rep_resp[] = { NULL }; -static const int *cfdp_finish_pdu_flags [] = { +static int * const cfdp_finish_pdu_flags [] = { &hf_cfdp_condition_code, &hf_cfdp_end_system_stat, &hf_cfdp_delivery_code, @@ -537,7 +537,7 @@ static const int *cfdp_finish_pdu_flags [] = { NULL }; -static const int *cfdp_remote_suspend_resume_req [] = { +static int * const cfdp_remote_suspend_resume_req [] = { &hf_cfdp_spare_one_2, &hf_cfdp_entid_length, &hf_cfdp_spare_one, @@ -546,7 +546,7 @@ static const int *cfdp_remote_suspend_resume_req [] = { }; -static const int *cfdp_remote_suspend_resume_resp [] = { +static int * const cfdp_remote_suspend_resume_resp [] = { &hf_cfdp_suspension_ind, &hf_cfdp_trans_stat_2, &hf_cfdp_spare_five, diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index 4bf273538c..b4532ce91d 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -151,7 +151,7 @@ static dissector_handle_t charging_ase_handle; /*--- Included file: packet-charging_ase-fn.c ---*/ #line 1 "./asn1/charging_ase/packet-charging_ase-fn.c" -static const int * ChargingControlIndicators_bits[] = { +static int * const ChargingControlIndicators_bits[] = { &hf_charging_ase_ChargingControlIndicators_subscriberCharge, &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff, &hf_charging_ase_ChargingControlIndicators_delayUntilStart, @@ -213,7 +213,7 @@ dissect_charging_ase_TariffDuration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * SubTariffControl_bits[] = { +static int * const SubTariffControl_bits[] = { &hf_charging_ase_SubTariffControl_oneTimeCharge, NULL }; @@ -257,7 +257,7 @@ dissect_charging_ase_SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTar } -static const int * T_tariffControlIndicators_bits[] = { +static int * const T_tariffControlIndicators_bits[] = { &hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff, NULL }; @@ -378,7 +378,7 @@ dissect_charging_ase_SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTar } -static const int * T_tariffControlIndicators_01_bits[] = { +static int * const T_tariffControlIndicators_01_bits[] = { &hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff, NULL }; @@ -697,7 +697,7 @@ dissect_charging_ase_AddOnChargingInformation(gboolean implicit_tag _U_, tvbuff_ } -static const int * T_acknowledgementIndicators_bits[] = { +static int * const T_acknowledgementIndicators_bits[] = { &hf_charging_ase_T_acknowledgementIndicators_accepted, NULL }; @@ -758,7 +758,7 @@ dissect_charging_ase_StartCharging(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * T_stopIndicators_bits[] = { +static int * const T_stopIndicators_bits[] = { &hf_charging_ase_T_stopIndicators_callAttemptChargesApplicable, NULL }; diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index bf3609ada2..3bf52582ca 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -3024,7 +3024,7 @@ static int dissect_id_revision(packet_info *pinfo, proto_tree *tree, proto_item static int dissect_id_status(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { - static const int * status[] = { + static int * const status[] = { &hf_id_status_owned, &hf_id_status_conf, &hf_id_status_extended1, @@ -3101,7 +3101,7 @@ static int dissect_time_sync_grandmaster_clock(packet_info *pinfo, proto_tree *t proto_tree_add_item( tree, hf_time_sync_gm_clock_offset_scaled_log_variance, tvb, offset+12, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item( tree, hf_time_sync_gm_clock_current_utc_offset, tvb, offset+14, 2, ENC_LITTLE_ENDIAN); - static const int* bits[] = { + static int* const bits[] = { &hf_time_sync_gm_clock_time_property_flags_leap61, &hf_time_sync_gm_clock_time_property_flags_leap59, &hf_time_sync_gm_clock_time_property_flags_current_utc_valid, @@ -3149,7 +3149,7 @@ static int dissect_time_sync_local_clock(packet_info *pinfo, proto_tree *tree, p proto_tree_add_item( tree, hf_time_sync_local_clock_offset_scaled_log_variance, tvb, offset+12, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item( tree, hf_time_sync_local_clock_current_utc_offset, tvb, offset+14, 2, ENC_LITTLE_ENDIAN); - static const int* bits[] = { + static int* const bits[] = { &hf_time_sync_local_clock_time_property_flags_leap61, &hf_time_sync_local_clock_time_property_flags_leap59, &hf_time_sync_local_clock_time_property_flags_current_utc_valid, @@ -3297,7 +3297,7 @@ static int dissect_time_sync_clock_type(packet_info *pinfo, proto_tree *tree, pr return total_len; } - static const int* bits[] = { + static int* const bits[] = { &hf_time_sync_clock_type_management, &hf_time_sync_clock_type_end_to_end, &hf_time_sync_clock_type_boundary, @@ -4175,7 +4175,7 @@ static void dissect_transport_type_trigger(tvbuff_t *tvb, int offset, proto_tree *tree, int hf_ttt, int hf_direction, int hf_trigger, int hf_class, gint ett) { - const int* bits[] = { + int* const bits[] = { &hf_direction, &hf_trigger, &hf_class, @@ -7609,7 +7609,7 @@ dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, proto_item *ti, ot_rtf = (temp_data >> 1) & 7; to_rtf = (temp_data >> 4) & 7; - static const int* connection_flags[] = { + static int *const connection_flags[] = { &hf_cip_cco_con_type, &hf_cip_cco_ot_rtf, &hf_cip_cco_to_rtf, @@ -8175,7 +8175,7 @@ void dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_ void dissect_cip_run_idle(tvbuff_t* tvb, int offset, proto_tree* item_tree) { - static const int * run_idle_header[] = { + static int * const run_idle_header[] = { &hf_32bitheader_roo, &hf_32bitheader_coo, &hf_32bitheader_run_idle, diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index 6d5fb42daf..c0eee45e39 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -506,7 +506,7 @@ static const value_string cip_sc_vals[] = { static int dissect_axis_status(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_axis_sts_local_ctrl, &hf_cip_axis_sts_alarm, &hf_cip_axis_sts_dc_bus, @@ -543,7 +543,7 @@ static int dissect_axis_status(packet_info *pinfo _U_, proto_tree *tree, proto_i static int dissect_axis_status2(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_axis_sts2_motor, &hf_cip_axis_sts2_regenerate, &hf_cip_axis_sts2_ride_thru, @@ -579,7 +579,7 @@ static int dissect_axis_status2(packet_info *pinfo _U_, proto_tree *tree, proto_ static int dissect_event_checking_control(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_evnt_ctrl_reg1_pos, &hf_cip_evnt_ctrl_reg1_neg, &hf_cip_evnt_ctrl_reg2_pos, @@ -610,7 +610,7 @@ static int dissect_event_checking_control(packet_info *pinfo _U_, proto_tree *tr static int dissect_event_checking_status(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_evnt_sts_reg1_pos, &hf_cip_evnt_sts_reg1_neg, &hf_cip_evnt_sts_reg2_pos, @@ -641,7 +641,7 @@ static int dissect_event_checking_status(packet_info *pinfo _U_, proto_tree *tre static int dissect_actual_data_set_bits(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_act_data_pos, &hf_cip_act_data_vel, &hf_cip_act_data_acc, @@ -656,7 +656,7 @@ static int dissect_actual_data_set_bits(packet_info *pinfo _U_, proto_tree *tree static int dissect_command_data_set_bits(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_cmd_data_pos_cmd, &hf_cip_cmd_data_vel_cmd, &hf_cip_cmd_data_acc_cmd, @@ -672,7 +672,7 @@ static int dissect_command_data_set_bits(packet_info *pinfo _U_, proto_tree *tre static int dissect_command_control(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_intrp, &hf_cip_position_data_type, NULL @@ -686,7 +686,7 @@ static int dissect_command_control(packet_info *pinfo _U_, proto_tree *tree, pro static int dissect_status_data_set_bits(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_sts_flt, &hf_cip_sts_alrm, &hf_cip_sts_sts, @@ -703,7 +703,7 @@ static int dissect_status_data_set_bits(packet_info *pinfo _U_, proto_tree *tree static int dissect_node_control(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_node_control_remote, &hf_cip_node_control_sync, &hf_cip_node_data_valid, @@ -719,7 +719,7 @@ static int dissect_node_control(packet_info *pinfo _U_, proto_tree *tree, proto_ static int dissect_node_status(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_node_control_remote, &hf_cip_node_control_sync, &hf_cip_node_data_valid, @@ -735,7 +735,7 @@ static int dissect_node_status(packet_info *pinfo _U_, proto_tree *tree, proto_i static int dissect_time_data_set(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_time_data_stamp, &hf_cip_time_data_offset, &hf_cip_time_data_diag, @@ -751,7 +751,7 @@ static int dissect_time_data_set(packet_info *pinfo _U_, proto_tree *tree, proto static int dissect_control_status(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_control_status_complete, &hf_cip_control_status_bus_up, &hf_cip_control_status_bus_unload, @@ -767,7 +767,7 @@ static int dissect_control_status(packet_info *pinfo _U_, proto_tree *tree, prot static int dissect_feedback_mode(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_cip_feedback_mode, &hf_cip_feedback_data_type, NULL @@ -781,7 +781,7 @@ static int dissect_feedback_mode(packet_info *pinfo _U_, proto_tree *tree, proto static int dissect_connection_configuration_bits(packet_info* pinfo _U_, proto_tree* tree, proto_item* item _U_, tvbuff_t* tvb, int offset, int total_len _U_) { - static const int* bits[] = { + static int* const bits[] = { &hf_connection_configuration_bits_power, &hf_connection_configuration_bits_safety_bit_valid, &hf_connection_configuration_bits_allow_network_safety, diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index de6a92d7df..71d4a03f5d 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -944,7 +944,7 @@ static int dissect_s_validator_type(packet_info *pinfo, proto_tree *tree, proto_ return total_len; } - static const int* bits[] = { + static int* const bits[] = { &hf_cip_svalidator_type_pc, &hf_cip_svalidator_type_conn_type, NULL @@ -1439,7 +1439,7 @@ static void dissect_ack_byte( proto_tree *tree, tvbuff_t *tvb, int offset) { // TODO: add ack_byte validation - static const int* bits[] = { + static int* const bits[] = { &hf_cipsafety_ack_byte_ping_count_reply, &hf_cipsafety_ack_byte_reserved1, &hf_cipsafety_ack_byte_ping_response, @@ -1455,7 +1455,7 @@ static void dissect_mcast_byte( proto_tree *tree, tvbuff_t *tvb, int offset) { // TODO: add mcast_byte validation - static const int* bits[] = { + static int* const bits[] = { &hf_cipsafety_mcast_byte_consumer_num, &hf_cipsafety_mcast_byte_reserved1, &hf_cipsafety_mcast_byte_mai, diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 389078f577..c49bcf8d55 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -2171,7 +2171,7 @@ dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * FunctionalUnits_bits[] = { +static int * const FunctionalUnits_bits[] = { &hf_cmip_FunctionalUnits_multipleObjectSelection, &hf_cmip_FunctionalUnits_filter, &hf_cmip_FunctionalUnits_multipleReply, @@ -2190,7 +2190,7 @@ dissect_cmip_FunctionalUnits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } -static const int * ProtocolVersion_bits[] = { +static int * const ProtocolVersion_bits[] = { &hf_cmip_ProtocolVersion_version1, &hf_cmip_ProtocolVersion_version2, NULL @@ -3508,7 +3508,7 @@ dissect_cmip_UsageState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * T_daysOfWeek_bits[] = { +static int * const T_daysOfWeek_bits[] = { &hf_cmip_T_daysOfWeek_sunday, &hf_cmip_T_daysOfWeek_monday, &hf_cmip_T_daysOfWeek_tuesday, diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index dfd86ad868..13270fd61e 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -495,7 +495,7 @@ dissect_cmp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ } -static const int * PKIFailureInfo_bits[] = { +static int * const PKIFailureInfo_bits[] = { &hf_cmp_PKIFailureInfo_badAlg, &hf_cmp_PKIFailureInfo_badMessageCheck, &hf_cmp_PKIFailureInfo_badRequest, diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c index 66d78682ad..22ff1b46cd 100644 --- a/epan/dissectors/packet-cnip.c +++ b/epan/dissectors/packet-cnip.c @@ -71,7 +71,7 @@ static int dissect_cnip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo proto_tree *ti; proto_tree *cnip_tree; - static const gint *pf_fields[] = { + static int * const pf_fields[] = { &hf_cnip_pf_sec, &hf_cnip_pf_pcode, NULL diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index c76f4b0d97..631ecc92ed 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -6015,7 +6015,7 @@ cops_analyze_packetcable_dqos_obj(tvbuff_t *tvb, packet_info *pinfo, proto_tree static void decode_docsis_request_transmission_policy(tvbuff_t *tvb, guint32 offset, proto_tree *tree) { - static const int *policies[] = { + static int * const policies[] = { &hf_cops_pcmm_request_transmission_policy_sf_all_cm, &hf_cops_pcmm_request_transmission_policy_sf_priority, &hf_cops_pcmm_request_transmission_policy_sf_request_for_request, diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c index ad3534a2b8..b42b9a7527 100644 --- a/epan/dissectors/packet-couchbase.c +++ b/epan/dissectors/packet-couchbase.c @@ -872,14 +872,14 @@ const value_string vbucket_states_vals[] = { {0, NULL} }; -static const int * datatype_vals[] = { +static int * const datatype_vals[] = { &hf_datatype_json, &hf_datatype_snappy, &hf_datatype_xattr, NULL }; -static const int * subdoc_flags[] = { +static int * const subdoc_flags[] = { &hf_subdoc_flags_mkdirp, &hf_subdoc_flags_xattrpath, &hf_subdoc_flags_expandmacros, @@ -887,7 +887,7 @@ static const int * subdoc_flags[] = { NULL }; -static const int * subdoc_doc_flags[] = { +static int * const subdoc_doc_flags[] = { &hf_subdoc_doc_flags_mkdoc, &hf_subdoc_doc_flags_add, &hf_subdoc_doc_flags_accessdeleted, @@ -895,7 +895,7 @@ static const int * subdoc_doc_flags[] = { NULL }; -static const int *set_with_meta_extra_flags[] = { +static int * const set_with_meta_extra_flags[] = { &hf_force_meta, &hf_force_accept, &hf_regenerate_cas, @@ -903,7 +903,7 @@ static const int *set_with_meta_extra_flags[] = { NULL }; -static const int *del_with_meta_extra_flags[] = { +static int * const del_with_meta_extra_flags[] = { &hf_force_meta, &hf_force_accept, &hf_regenerate_cas, @@ -945,7 +945,7 @@ static const value_string dcp_system_event_id_vals [] = { {0, NULL} }; -static const int * snapshot_marker_flags [] = { +static int * const snapshot_marker_flags [] = { &hf_extras_flags_dcp_snapshot_marker_memory, &hf_extras_flags_dcp_snapshot_marker_disk, &hf_extras_flags_dcp_snapshot_marker_chk, @@ -1231,7 +1231,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_CMD_TAP_CONNECT: { - static const int * extra_flags[] = { + static int * const extra_flags[] = { &hf_extras_flags_backfill, &hf_extras_flags_dump, &hf_extras_flags_list_vbuckets, @@ -1280,7 +1280,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_DCP_OPEN_CONNECTION: if (extlen) { if (request) { - static const int * extra_flags[] = { + static int * const extra_flags[] = { &hf_extras_flags_dcp_connection_type, &hf_extras_flags_dcp_include_xattrs, &hf_extras_flags_dcp_no_value, @@ -1306,7 +1306,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_DCP_ADD_STREAM: if (extlen) { if (request) { - static const int * extra_flags[] = { + static int * const extra_flags[] = { &hf_extras_flags_dcp_add_stream_takeover, &hf_extras_flags_dcp_add_stream_diskonly, &hf_extras_flags_dcp_add_stream_latest, @@ -1327,7 +1327,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_DCP_STREAM_REQUEST: if (extlen) { if (request) { - static const int * extra_flags[] = { + static int * const extra_flags[] = { NULL }; @@ -1381,7 +1381,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_DCP_MUTATION: if (extlen) { if (request) { - static const int * extra_flags[] = { + static int * const extra_flags[] = { NULL }; @@ -1501,7 +1501,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_DCP_PREPARE: { if (extlen) { if (request) { - static const int * extra_flags[] = { + static int * const extra_flags[] = { NULL }; proto_tree_add_item(extras_tree, hf_extras_by_seqno, tvb, offset, 8, ENC_BIG_ENDIAN); @@ -1592,7 +1592,7 @@ dissect_extras(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case PROTOCOL_BINARY_DCP_OSO_SNAPSHOT: { if (extlen) { if (request) { - static const int * extra_flags[] = { + static int * const extra_flags[] = { &hf_extras_flags_dcp_oso_snapshot_begin, &hf_extras_flags_dcp_oso_snapshot_end, NULL diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c index 142cac3699..30f53f8494 100644 --- a/epan/dissectors/packet-cp2179.c +++ b/epan/dissectors/packet-cp2179.c @@ -294,7 +294,7 @@ static int hf_cp2179_timetag_event_second = -1; static dissector_handle_t cp2179_handle; -static const int *cp2179_simplestatus_bits[] = { +static int * const cp2179_simplestatus_bits[] = { &hf_cp2179_simplestatusbit0, &hf_cp2179_simplestatusbit1, &hf_cp2179_simplestatusbit2, @@ -314,7 +314,7 @@ static const int *cp2179_simplestatus_bits[] = { NULL }; -static const int *cp2179_2bitstatus_bits[] = { +static int * const cp2179_2bitstatus_bits[] = { &hf_cp2179_2bitstatuschg0, &hf_cp2179_2bitstatuschg1, &hf_cp2179_2bitstatuschg2, diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index 2595f16651..cf28037ab0 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -388,7 +388,7 @@ dissect_cql_query_parameters(proto_tree* cql_subtree, tvbuff_t* tvb, gint offset guint32 string_length = 0; guint32 value_count = 0; - static const int * cql_query_bitmaps[] = { + static int * const cql_query_bitmaps[] = { &hf_cql_query_flags_values, &hf_cql_query_flags_skip_metadata, &hf_cql_query_flags_page_size, @@ -967,21 +967,21 @@ dissect_cql_tcp_pdu(tvbuff_t* raw_tvb, packet_info* pinfo, proto_tree* tree, voi cql_transaction_type* cql_trans = NULL; cql_compression_level compression_level = CQL_COMPRESSION_NONE; - static const int * cql_batch_flags_bitmaps[] = { + static int * const cql_batch_flags_bitmaps[] = { &hf_cql_batch_flag_serial_consistency, &hf_cql_batch_flag_default_timestamp, &hf_cql_batch_flag_with_name_for_values, NULL }; - static const int * cql_header_bitmaps_v3[] = { + static int * const cql_header_bitmaps_v3[] = { &hf_cql_flag_compression, &hf_cql_flag_tracing, &hf_cql_flag_reserved3, NULL }; - static const int * cql_header_bitmaps_v4[] = { + static int * const cql_header_bitmaps_v4[] = { &hf_cql_flag_compression, &hf_cql_flag_tracing, &hf_cql_flag_custom_payload, diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index 9f1eb7295d..73c1b46c90 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -219,7 +219,7 @@ dissect_csm_encaps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tree) { - static const int * control_flags[] = { + static int * const control_flags[] = { &hf_csm_encaps_ctrl_ack, &hf_csm_encaps_ctrl_ack_suppress, &hf_csm_encaps_ctrl_endian, diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index bd5d440111..b1af4c4363 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -749,7 +749,7 @@ dissect_dap_FamilyGrouping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * ServiceControlOptions_bits[] = { +static int * const ServiceControlOptions_bits[] = { &hf_dap_ServiceControlOptions_preferChaining, &hf_dap_ServiceControlOptions_chainingProhibited, &hf_dap_ServiceControlOptions_localScope, @@ -2013,7 +2013,7 @@ dissect_dap_Credentials(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * Versions_bits[] = { +static int * const Versions_bits[] = { &hf_dap_Versions_v1, &hf_dap_Versions_v2, NULL @@ -2302,7 +2302,7 @@ dissect_dap_T_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } -static const int * T_permission_bits[] = { +static int * const T_permission_bits[] = { &hf_dap_T_permission_add, &hf_dap_T_permission_remove, &hf_dap_T_permission_rename, @@ -2979,7 +2979,7 @@ dissect_dap_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * HierarchySelections_bits[] = { +static int * const HierarchySelections_bits[] = { &hf_dap_HierarchySelections_self, &hf_dap_HierarchySelections_children, &hf_dap_HierarchySelections_parent, @@ -3003,7 +3003,7 @@ dissect_dap_HierarchySelections(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const int * SearchControlOptions_bits[] = { +static int * const SearchControlOptions_bits[] = { &hf_dap_SearchControlOptions_searchAliases, &hf_dap_SearchControlOptions_matchedValuesOnly, &hf_dap_SearchControlOptions_checkOverspecified, diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c index c6a85d3afc..a3ae39b63d 100644 --- a/epan/dissectors/packet-dcerpc-atsvc.c +++ b/epan/dissectors/packet-dcerpc-atsvc.c @@ -363,7 +363,7 @@ int atsvc_dissect_bitmap_DaysOfMonth(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * atsvc_atsvc_DaysOfMonth_fields[] = { + static int * const atsvc_atsvc_DaysOfMonth_fields[] = { &hf_atsvc_atsvc_DaysOfMonth_First, &hf_atsvc_atsvc_DaysOfMonth_Second, &hf_atsvc_atsvc_DaysOfMonth_Third, @@ -429,7 +429,7 @@ int atsvc_dissect_bitmap_Flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * atsvc_atsvc_Flags_fields[] = { + static int * const atsvc_atsvc_Flags_fields[] = { &hf_atsvc_atsvc_Flags_JOB_RUN_PERIODICALLY, &hf_atsvc_atsvc_Flags_JOB_EXEC_ERROR, &hf_atsvc_atsvc_Flags_JOB_RUNS_TODAY, @@ -470,7 +470,7 @@ int atsvc_dissect_bitmap_DaysOfWeek(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * atsvc_atsvc_DaysOfWeek_fields[] = { + static int * const atsvc_atsvc_DaysOfWeek_fields[] = { &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY, &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY, &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY, diff --git a/epan/dissectors/packet-dcerpc-clusapi.c b/epan/dissectors/packet-dcerpc-clusapi.c index 0dd82dfbaf..fdf3185dae 100644 --- a/epan/dissectors/packet-dcerpc-clusapi.c +++ b/epan/dissectors/packet-dcerpc-clusapi.c @@ -3232,7 +3232,7 @@ int clusapi_dissect_bitmap_ClusterEnumType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * clusapi_ClusterEnumType_fields[] = { + static int * const clusapi_ClusterEnumType_fields[] = { &hf_clusapi_ClusterEnumType_CLUSTER_ENUM_NODE, &hf_clusapi_ClusterEnumType_CLUSTER_ENUM_RESTYPE, &hf_clusapi_ClusterEnumType_CLUSTER_ENUM_RESOURCE, @@ -3978,7 +3978,7 @@ int clusapi_dissect_bitmap_ClusterGroupEnumType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * clusapi_ClusterGroupEnumType_fields[] = { + static int * const clusapi_ClusterGroupEnumType_fields[] = { &hf_clusapi_ClusterGroupEnumType_CLUSTER_GROUP_ENUM_CONTAINS, &hf_clusapi_ClusterGroupEnumType_CLUSTER_GROUP_ENUM_NODES, NULL @@ -4357,7 +4357,7 @@ int clusapi_dissect_bitmap_ClusterResTypeEnumType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * clusapi_ClusterResTypeEnumType_fields[] = { + static int * const clusapi_ClusterResTypeEnumType_fields[] = { &hf_clusapi_ClusterResTypeEnumType_CLUSTER_RESOURCE_TYPE_ENUM_NODES, &hf_clusapi_ClusterResTypeEnumType_CLUSTER_RESOURCE_TYPE_ENUM_RESOURCES, NULL @@ -4475,7 +4475,7 @@ int clusapi_dissect_bitmap_DesiredAccessMask(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * clusapi_clusapi_DesiredAccessMask_fields[] = { + static int * const clusapi_clusapi_DesiredAccessMask_fields[] = { &hf_clusapi_clusapi_DesiredAccessMask_CLUSAPI_READ_ACCESS, &hf_clusapi_clusapi_DesiredAccessMask_CLUSAPI_CHANGE_ACCESS, &hf_clusapi_clusapi_DesiredAccessMask_CLUSAPI_GENERIC_READ, diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c index 13c0d6a9f1..59cd704c7b 100644 --- a/epan/dissectors/packet-dcerpc-dfs.c +++ b/epan/dissectors/packet-dcerpc-dfs.c @@ -660,7 +660,7 @@ int netdfs_dissect_bitmap_dfs_VolumeState(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * netdfs_dfs_VolumeState_fields[] = { + static int * const netdfs_dfs_VolumeState_fields[] = { &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK, &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT, &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE, @@ -796,7 +796,7 @@ int netdfs_dissect_bitmap_dfs_StorageState(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * netdfs_dfs_StorageState_fields[] = { + static int * const netdfs_dfs_StorageState_fields[] = { &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE, &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE, &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE, @@ -1190,7 +1190,7 @@ int netdfs_dissect_bitmap_dfs_PropertyFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * netdfs_dfs_PropertyFlags_fields[] = { + static int * const netdfs_dfs_PropertyFlags_fields[] = { &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS, &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY, &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING, diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index d4b6c7dede..91bd7d84b0 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -745,7 +745,7 @@ int dnsserver_dissect_bitmap_DNS_LOG_LEVELS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * dnsserver_DNS_LOG_LEVELS_fields[] = { + static int * const dnsserver_DNS_LOG_LEVELS_fields[] = { &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUERY, &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_NOTIFY, &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_UPDATE, @@ -789,7 +789,7 @@ int dnsserver_dissect_bitmap_DNS_RPC_PROTOCOLS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * dnsserver_DNS_RPC_PROTOCOLS_fields[] = { + static int * const dnsserver_DNS_RPC_PROTOCOLS_fields[] = { &hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_TCPIP, &hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_NAMED_PIPE, &hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_LPC, @@ -907,7 +907,7 @@ int dnsserver_dissect_bitmap_DNS_SELECT_FLAGS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * dnsserver_DNS_SELECT_FLAGS_fields[] = { + static int * const dnsserver_DNS_SELECT_FLAGS_fields[] = { &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA, &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_CACHE_DATA, &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA, @@ -956,7 +956,7 @@ int dnsserver_dissect_bitmap_DNS_RPC_NODE_FLAGS(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * dnsserver_DNS_RPC_NODE_FLAGS_fields[] = { + static int * const dnsserver_DNS_RPC_NODE_FLAGS_fields[] = { &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_CACHE_DATA, &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_ROOT, &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AUTH_ZONE_ROOT, diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c index f2dbd95e76..4c6783e308 100644 --- a/epan/dissectors/packet-dcerpc-dssetup.c +++ b/epan/dissectors/packet-dcerpc-dssetup.c @@ -165,7 +165,7 @@ int dssetup_dissect_bitmap_DsRoleFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * dssetup_dssetup_DsRoleFlags_fields[] = { + static int * const dssetup_dssetup_DsRoleFlags_fields[] = { &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_RUNNING, &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_MIXED_MODE, &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS, diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c index 8449718460..cb39f57015 100644 --- a/epan/dissectors/packet-dcerpc-eventlog.c +++ b/epan/dissectors/packet-dcerpc-eventlog.c @@ -376,7 +376,7 @@ int eventlog_dissect_bitmap_eventlogReadFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * eventlog_eventlogReadFlags_fields[] = { + static int * const eventlog_eventlogReadFlags_fields[] = { &hf_eventlog_eventlogReadFlags_EVENTLOG_SEQUENTIAL_READ, &hf_eventlog_eventlogReadFlags_EVENTLOG_SEEK_READ, &hf_eventlog_eventlogReadFlags_EVENTLOG_FORWARDS_READ, @@ -416,7 +416,7 @@ int eventlog_dissect_bitmap_eventlogEventTypes(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * eventlog_eventlogEventTypes_fields[] = { + static int * const eventlog_eventlogEventTypes_fields[] = { &hf_eventlog_eventlogEventTypes_EVENTLOG_ERROR_TYPE, &hf_eventlog_eventlogEventTypes_EVENTLOG_WARNING_TYPE, &hf_eventlog_eventlogEventTypes_EVENTLOG_INFORMATION_TYPE, diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c index f019e7c207..967a060d91 100644 --- a/epan/dissectors/packet-dcerpc-frsrpc.c +++ b/epan/dissectors/packet-dcerpc-frsrpc.c @@ -888,7 +888,7 @@ int frsrpc_dissect_bitmap_CommPktCoCmdFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * frsrpc_frsrpc_CommPktCoCmdFlags_fields[] = { + static int * const frsrpc_frsrpc_CommPktCoCmdFlags_fields[] = { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_ABORT_CO, &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_VV_ACTIVATED, &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_CONTENT_CMD, @@ -939,7 +939,7 @@ int frsrpc_dissect_bitmap_CommPktCoCmdIFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * frsrpc_frsrpc_CommPktCoCmdIFlags_fields[] = { + static int * const frsrpc_frsrpc_CommPktCoCmdIFlags_fields[] = { &hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_VVRETIRE_EXEC, &hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_CO_ABORT, &hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_DIR_ENUM_PENDING, @@ -1026,7 +1026,7 @@ int frsrpc_dissect_bitmap_CommPktCoCmdContentCmd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * frsrpc_frsrpc_CommPktCoCmdContentCmd_fields[] = { + static int * const frsrpc_frsrpc_CommPktCoCmdContentCmd_fields[] = { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_OVERWRITE, &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_EXTEND, &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_TRUNCATION, diff --git a/epan/dissectors/packet-dcerpc-frstrans.c b/epan/dissectors/packet-dcerpc-frstrans.c index 0c46b13f07..a4e497ce7c 100644 --- a/epan/dissectors/packet-dcerpc-frstrans.c +++ b/epan/dissectors/packet-dcerpc-frstrans.c @@ -363,7 +363,7 @@ int frstrans_dissect_bitmap_TransportFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * frstrans_frstrans_TransportFlags_fields[] = { + static int * const frstrans_frstrans_TransportFlags_fields[] = { &hf_frstrans_frstrans_TransportFlags_FRSTRANS_TRANSPORT_SUPPORTS_RDC_SIMILARITY, NULL }; diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c index 8168237494..21ac2e9881 100644 --- a/epan/dissectors/packet-dcerpc-initshutdown.c +++ b/epan/dissectors/packet-dcerpc-initshutdown.c @@ -202,7 +202,7 @@ int initshutdown_dissect_bitmap_ReasonFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * initshutdown_initshutdown_ReasonFlags_fields[] = { + static int * const initshutdown_initshutdown_ReasonFlags_fields[] = { &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_USER_DEFINED, &hf_initshutdown_initshutdown_ReasonFlags_SHTDN_REASON_FLAG_PLANNED, NULL diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c index c233a2bade..d1868f9c98 100644 --- a/epan/dissectors/packet-dcerpc-lsa.c +++ b/epan/dissectors/packet-dcerpc-lsa.c @@ -1317,7 +1317,7 @@ static int lsarpc_dissect_element_lsa_LookupNames4_unknown2(tvbuff_t *tvb _U_, i static void lsarpc_policy_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION, &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_LOOKUP_NAMES, &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SERVER_ADMIN, @@ -1338,7 +1338,7 @@ lsarpc_policy_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin static void lsarpc_account_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS, &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS, &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES, @@ -1350,7 +1350,7 @@ lsarpc_account_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, gui static void lsarpc_secret_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE, &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE, NULL @@ -1360,7 +1360,7 @@ lsarpc_secret_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin static void lsarpc_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_AUTH, &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_AUTH, &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_POSIX, diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c index 5e2f5ffd01..1f8e818cfc 100644 --- a/epan/dissectors/packet-dcerpc-mapi.c +++ b/epan/dissectors/packet-dcerpc-mapi.c @@ -9206,7 +9206,7 @@ int mapi_dissect_bitmap_ulEventType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * mapi_ulEventType_fields[] = { + static int * const mapi_ulEventType_fields[] = { &hf_mapi_ulEventType_fnevCriticalError, &hf_mapi_ulEventType_fnevNewMail, &hf_mapi_ulEventType_fnevObjectCreated, diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index 6370566fe5..27f89d9f8b 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -607,7 +607,7 @@ netlogon_dissect_EXTRA_FLAGS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * extraflags[] = { + static int * const extraflags[] = { &hf_netlogon_extra_flags_root_forest, &hf_netlogon_trust_flags_dc_firsthop, &hf_netlogon_trust_flags_rodc_to_dc, @@ -777,7 +777,7 @@ netlogon_dissect_USER_ACCOUNT_CONTROL(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * uac[] = { + static int * const uac[] = { &hf_netlogon_user_account_control_dont_require_preauth, &hf_netlogon_user_account_control_use_des_key_only, &hf_netlogon_user_account_control_not_delegated, @@ -1479,7 +1479,7 @@ netlogon_dissect_GROUP_MEMBERSHIP_ATTRIBUTES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * attr[] = { + static int * const attr[] = { &hf_netlogon_group_attrs_enabled, &hf_netlogon_group_attrs_enabled_by_default, &hf_netlogon_group_attrs_mandatory, @@ -1574,7 +1574,7 @@ netlogon_dissect_USER_FLAGS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_netlogon_user_flags_resource_groups, &hf_netlogon_user_flags_extra_sids, NULL @@ -5310,7 +5310,7 @@ netlogon_dissect_DOMAIN_TRUST_FLAGS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_netlogon_trust_flags_inbound, &hf_netlogon_trust_flags_native_mode, &hf_netlogon_trust_flags_primary, @@ -5368,7 +5368,7 @@ netlogon_dissect_DOMAIN_TRUST_ATTRIBS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * attr[] = { + static int * const attr[] = { &hf_netlogon_trust_attribs_treat_as_external, &hf_netlogon_trust_attribs_within_forest, &hf_netlogon_trust_attribs_cross_organization, @@ -5483,7 +5483,7 @@ netlogon_dissect_GET_DCNAME_REQUEST_FLAGS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_netlogon_get_dcname_request_flags_return_flat_name, &hf_netlogon_get_dcname_request_flags_return_dns_name, &hf_netlogon_get_dcname_request_flags_is_flat_name, @@ -5589,7 +5589,7 @@ netlogon_dissect_DC_FLAGS(tvbuff_t *tvb, int offset, { guint32 mask; proto_item *item; - static const int * flags[] = { + static int * const flags[] = { &hf_netlogon_dc_flags_dns_forest_flag, &hf_netlogon_dc_flags_dns_domain_flag, &hf_netlogon_dc_flags_dns_controller_flag, @@ -6642,7 +6642,7 @@ netlogon_dissect_netrlogoncomputeclientdigest_reply(tvbuff_t *tvb, int offset, } static int netlogon_dissect_neg_options(tvbuff_t *tvb,proto_tree *tree,guint32 flags,int offset) { - static const int * hf_flags[] = { + static int * const hf_flags[] = { #if 0 &hf_netlogon_neg_flags_80000000, #endif @@ -7612,7 +7612,7 @@ static int dissect_secchan_nl_auth_message(tvbuff_t *tvb, int offset, proto_tree *subtree = NULL; guint32 messagetype; guint64 messageflags; - static const int *flag_fields[] = { + static int * const flag_fields[] = { &hf_netlogon_secchan_nl_message_flags_nb_domain, &hf_netlogon_secchan_nl_message_flags_nb_host, &hf_netlogon_secchan_nl_message_flags_dns_domain, diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index d1d9e3c768..cc4ec4cd3c 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -1559,7 +1559,7 @@ dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, dcerpc_info *di, guint8 *drep) { guint32 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_nt_acb_autolock, &hf_nt_acb_pwnoexp, &hf_nt_acb_svrtrust, diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index f4e0aa3cf6..099b1be893 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -1987,7 +1987,7 @@ static int samr_dissect_element_ValidatePassword_rep__(tvbuff_t *tvb _U_, int of static void samr_connect_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_LOOKUP_DOMAIN, &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_ENUM_DOMAINS, &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CREATE_DOMAIN, @@ -2015,7 +2015,7 @@ samr_dissect_bitmap_ConnectAccessMask(tvbuff_t *tvb, int offset, packet_info *pi static void samr_alias_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER, &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER, &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS, @@ -2042,7 +2042,7 @@ samr_dissect_bitmap_AliasAccessMask(tvbuff_t *tvb, int offset, packet_info *pinf static void samr_group_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS, &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER, &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER, @@ -2069,7 +2069,7 @@ samr_dissect_bitmap_GroupAccessMask(tvbuff_t *tvb, int offset, packet_info *pinf static void samr_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1, &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1, &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2, @@ -2102,7 +2102,7 @@ samr_dissect_bitmap_DomainAccessMask(tvbuff_t *tvb, int offset, packet_info *pin static void samr_user_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP, &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP, &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUPS, @@ -2369,7 +2369,7 @@ int samr_dissect_bitmap_AcctFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * samr_samr_AcctFlags_fields[] = { + static int * const samr_samr_AcctFlags_fields[] = { &hf_samr_samr_AcctFlags_ACB_DISABLED, &hf_samr_samr_AcctFlags_ACB_HOMDIRREQ, &hf_samr_samr_AcctFlags_ACB_PWNOTREQ, @@ -2658,7 +2658,7 @@ int samr_dissect_bitmap_PasswordProperties(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * samr_samr_PasswordProperties_fields[] = { + static int * const samr_samr_PasswordProperties_fields[] = { &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX, &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE, &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_NO_CLEAR_CHANGE, @@ -3718,7 +3718,7 @@ int samr_dissect_bitmap_GroupAttrs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * samr_samr_GroupAttrs_fields[] = { + static int * const samr_samr_GroupAttrs_fields[] = { &hf_samr_samr_GroupAttrs_SE_GROUP_MANDATORY, &hf_samr_samr_GroupAttrs_SE_GROUP_ENABLED_BY_DEFAULT, &hf_samr_samr_GroupAttrs_SE_GROUP_ENABLED, @@ -5727,7 +5727,7 @@ int samr_dissect_bitmap_FieldsPresent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * samr_samr_FieldsPresent_fields[] = { + static int * const samr_samr_FieldsPresent_fields[] = { &hf_samr_samr_FieldsPresent_SAMR_FIELD_ACCOUNT_NAME, &hf_samr_samr_FieldsPresent_SAMR_FIELD_FULL_NAME, &hf_samr_samr_FieldsPresent_SAMR_FIELD_RID, @@ -7895,7 +7895,7 @@ int samr_dissect_bitmap_ValidateFieldsPresent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * samr_samr_ValidateFieldsPresent_fields[] = { + static int * const samr_samr_ValidateFieldsPresent_fields[] = { &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET, &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME, &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_LOCKOUT_TIME, diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 854ceac91e..3c89a26888 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -1405,7 +1405,7 @@ dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint32 fields; proto_item *hidden_item; - static const int * hf_fields[] = { + static int * const hf_fields[] = { &hf_devmode_fields_orientation, &hf_devmode_fields_papersize, &hf_devmode_fields_paperlength, @@ -2005,7 +2005,7 @@ dissect_job_status(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 status; - static const int * hf_status[] = { + static int * const hf_status[] = { &hf_job_status_user_intervention, &hf_job_status_blocked, &hf_job_status_deleted, @@ -2123,7 +2123,7 @@ dissect_printer_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 attributes; - static const int * hf_attributes[] = { + static int * const hf_attributes[] = { &hf_printer_attributes_published, &hf_printer_attributes_raw_only, &hf_printer_attributes_enable_bidi, @@ -2232,7 +2232,7 @@ dissect_printer_driver_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 attributes; - static const int * hf_attributes[] = { + static int * const hf_attributes[] = { &hf_printer_driver_attributes_package_aware, &hf_printer_driver_attributes_xps, &hf_printer_driver_attributes_sandbox_enabled, @@ -2882,7 +2882,7 @@ dissect_notify_options_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep) { guint32 flags; - static const int * hf_flags[] = { + static int * const hf_flags[] = { &hf_notify_options_flags_refresh, NULL }; @@ -3061,7 +3061,7 @@ SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, dcerpc_info *di, guint8 *drep) { guint32 flags; - static const int * hf_flags[] = { + static int * const hf_flags[] = { &hf_rffpcnex_flags_timeout, &hf_rffpcnex_flags_delete_driver, &hf_rffpcnex_flags_set_driver, @@ -3833,7 +3833,7 @@ SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, { guint32 level, flags; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; - static const int * hf_flags[] = { + static int * const hf_flags[] = { &hf_enumprinters_flags_network, &hf_enumprinters_flags_shared, &hf_enumprinters_flags_remote, diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c index f7213eabc3..a6a3c64671 100644 --- a/epan/dissectors/packet-dcerpc-winreg.c +++ b/epan/dissectors/packet-dcerpc-winreg.c @@ -566,7 +566,7 @@ static int winreg_dissect_element_DeleteKeyEx_reserved(tvbuff_t *tvb _U_, int of static void winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_winreg_winreg_AccessMask_KEY_WOW64_32KEY, &hf_winreg_winreg_AccessMask_KEY_WOW64_64KEY, &hf_winreg_winreg_AccessMask_KEY_CREATE_LINK, @@ -886,7 +886,7 @@ int winreg_dissect_bitmap_KeyOptions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * winreg_winreg_KeyOptions_fields[] = { + static int * const winreg_winreg_KeyOptions_fields[] = { &hf_winreg_winreg_KeyOptions_REG_OPTION_VOLATILE, &hf_winreg_winreg_KeyOptions_REG_OPTION_CREATE_LINK, &hf_winreg_winreg_KeyOptions_REG_OPTION_BACKUP_RESTORE, @@ -1105,7 +1105,7 @@ int winreg_dissect_bitmap_NotifyChangeType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * winreg_winreg_NotifyChangeType_fields[] = { + static int * const winreg_winreg_NotifyChangeType_fields[] = { &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_NAME, &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_ATTRIBUTES, &hf_winreg_winreg_NotifyChangeType_REG_NOTIFY_CHANGE_LAST_SET, @@ -1143,7 +1143,7 @@ int winreg_dissect_bitmap_RestoreKeyFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * winreg_winreg_RestoreKeyFlags_fields[] = { + static int * const winreg_winreg_RestoreKeyFlags_fields[] = { &hf_winreg_winreg_RestoreKeyFlags_REG_WHOLE_HIVE_VOLATILE, &hf_winreg_winreg_RestoreKeyFlags_REG_REFRESH_HIVE, &hf_winreg_winreg_RestoreKeyFlags_REG_NO_LAZY_FLUSH, diff --git a/epan/dissectors/packet-dcerpc-winspool.c b/epan/dissectors/packet-dcerpc-winspool.c index 809f68143c..8b44db8266 100644 --- a/epan/dissectors/packet-dcerpc-winspool.c +++ b/epan/dissectors/packet-dcerpc-winspool.c @@ -1494,7 +1494,7 @@ int iremotewinspool_dissect_bitmap_winspool_InstallPrinterDriverFromPackageFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * iremotewinspool_winspool_InstallPrinterDriverFromPackageFlags_fields[] = { + static int * const iremotewinspool_winspool_InstallPrinterDriverFromPackageFlags_fields[] = { &hf_iremotewinspool_winspool_InstallPrinterDriverFromPackageFlags_IPDFP_COPY_ALL_FILES, NULL }; @@ -1528,7 +1528,7 @@ int iremotewinspool_dissect_bitmap_winspool_UploadPrinterDriverPackageFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * iremotewinspool_winspool_UploadPrinterDriverPackageFlags_fields[] = { + static int * const iremotewinspool_winspool_UploadPrinterDriverPackageFlags_fields[] = { &hf_iremotewinspool_winspool_UploadPrinterDriverPackageFlags_UPDP_UPLOAD_ALWAYS, &hf_iremotewinspool_winspool_UploadPrinterDriverPackageFlags_UPDP_CHECK_DRIVERSTORE, NULL diff --git a/epan/dissectors/packet-dcerpc-witness.c b/epan/dissectors/packet-dcerpc-witness.c index 289f752e4d..821ec951c1 100644 --- a/epan/dissectors/packet-dcerpc-witness.c +++ b/epan/dissectors/packet-dcerpc-witness.c @@ -442,7 +442,7 @@ int witness_dissect_bitmap_interfaceInfo_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * witness_witness_interfaceInfo_flags_fields[] = { + static int * const witness_witness_interfaceInfo_flags_fields[] = { &hf_witness_witness_interfaceInfo_flags_WITNESS_INFO_IPv4_VALID, &hf_witness_witness_interfaceInfo_flags_WITNESS_INFO_IPv6_VALID, &hf_witness_witness_interfaceInfo_flags_WITNESS_INFO_WITNESS_IF, @@ -743,7 +743,7 @@ int witness_dissect_bitmap_IPaddrInfo_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * witness_witness_IPaddrInfo_flags_fields[] = { + static int * const witness_witness_IPaddrInfo_flags_fields[] = { &hf_witness_witness_IPaddrInfo_flags_WITNESS_IPADDR_V4, &hf_witness_witness_IPaddrInfo_flags_WITNESS_IPADDR_V6, &hf_witness_witness_IPaddrInfo_flags_WITNESS_IPADDR_ONLINE, @@ -994,7 +994,7 @@ int witness_dissect_bitmap_RegisterEx_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_) { proto_item *item; - static const int * witness_witness_RegisterEx_flags_fields[] = { + static int * const witness_witness_RegisterEx_flags_fields[] = { &hf_witness_witness_RegisterEx_flags_WITNESS_REGISTER_IP_NOTIFICATION, NULL }; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 9e6b2bac7c..e0ca35e451 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -588,7 +588,7 @@ static int hf_dcerpc_sec_vt_bitmask_sign = -1; static int hf_dcerpc_sec_vt_pcontext_uuid = -1; static int hf_dcerpc_sec_vt_pcontext_ver = -1; -static const int *sec_vt_command_fields[] = { +static int * const sec_vt_command_fields[] = { &hf_dcerpc_sec_vt_command_cmd, &hf_dcerpc_sec_vt_command_end, &hf_dcerpc_sec_vt_command_must, @@ -614,18 +614,18 @@ static int hf_dcerpc_cmd_client_ipv4 = -1; static int hf_dcerpc_cmd_client_ipv6 = -1; static int hf_dcerpc_authentication_verifier = -1; -static const int *dcerpc_cn_bind_trans_btfn_fields[] = { +static int * const dcerpc_cn_bind_trans_btfn_fields[] = { &hf_dcerpc_cn_bind_trans_btfn_01, &hf_dcerpc_cn_bind_trans_btfn_02, NULL }; -static const int *sec_vt_bitmask_fields[] = { +static int * const sec_vt_bitmask_fields[] = { &hf_dcerpc_sec_vt_bitmask_sign, NULL }; -static const int *dcerpc_cn_fault_flags_fields[] = { +static int * const dcerpc_cn_fault_flags_fields[] = { &hf_dcerpc_cn_fault_flags_extended_error_info, NULL }; @@ -5132,7 +5132,7 @@ dissect_dcerpc_cn_rts(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint32 *cmd; guint32 i; const char *info_str = NULL; - static const int * flags[] = { + static int * const flags[] = { &hf_dcerpc_cn_rts_flags_ping, &hf_dcerpc_cn_rts_flags_other_cmd, &hf_dcerpc_cn_rts_flags_recycle_channel, @@ -5476,7 +5476,7 @@ dissect_dcerpc_cn(tvbuff_t *tvb, int offset, packet_info *pinfo, dcerpc_auth_info auth_info; tvbuff_t *fragment_tvb; dcerpc_decode_as_data* decode_data = dcerpc_get_decode_data(pinfo); - static const int * hdr_flags[] = { + static int * const hdr_flags[] = { &hf_dcerpc_cn_flags_object, &hf_dcerpc_cn_flags_maybe, &hf_dcerpc_cn_flags_dne, @@ -6376,7 +6376,7 @@ dissect_dcerpc_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat int auth_level; char *uuid_str; const char *uuid_name = NULL; - static const int * hdr_flags1[] = { + static int * const hdr_flags1[] = { &hf_dcerpc_dg_flags1_rsrvd_80, &hf_dcerpc_dg_flags1_broadcast, &hf_dcerpc_dg_flags1_idempotent, @@ -6388,7 +6388,7 @@ dissect_dcerpc_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat NULL }; - static const int * hdr_flags2[] = { + static int * const hdr_flags2[] = { &hf_dcerpc_dg_flags2_rsrvd_80, &hf_dcerpc_dg_flags2_rsrvd_40, &hf_dcerpc_dg_flags2_rsrvd_20, diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c index 00ca1fb9c8..4cfbaed697 100644 --- a/epan/dissectors/packet-dcom-dispatch.c +++ b/epan/dissectors/packet-dcom-dispatch.c @@ -266,7 +266,7 @@ dissect_IDispatch_Invoke_rqst(tvbuff_t *tvb, int offset, proto_item *dispparams_item; proto_tree *dispparams_tree; - static const int * flags[] = { + static int * const flags[] = { &hf_dispatch_flags_propputref, &hf_dispatch_flags_propput, &hf_dispatch_flags_propget, diff --git a/epan/dissectors/packet-dcom-typeinfo.c b/epan/dissectors/packet-dcom-typeinfo.c index e1671df13c..b1a0b5f7d4 100644 --- a/epan/dissectors/packet-dcom-typeinfo.c +++ b/epan/dissectors/packet-dcom-typeinfo.c @@ -266,7 +266,7 @@ int dissect_typeinfo_PARAMDESC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *sub_tree; guint32 u32SubStart; - static const int *flags[] = { + static int * const flags[] = { &hf_typeinfo_paramdesc_paramflags_fin, &hf_typeinfo_paramdesc_paramflags_fout, &hf_typeinfo_paramdesc_paramflags_flcid, @@ -400,7 +400,7 @@ int dissect_typeinfo_FUNCDESC(tvbuff_t *tvb, int offset, guint32 u32SubStart; - static const int *flags[] = { + static int * const flags[] = { &hf_typeinfo_funcdesc_funcflags_frestricted, &hf_typeinfo_funcdesc_funcflags_fsource, &hf_typeinfo_funcdesc_funcflags_fbindable, @@ -496,7 +496,7 @@ int dissect_typeinfo_TYPEATTR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *sub_tree; guint32 u32SubStart; - static const int *flags[] = { + static int * const flags[] = { &hf_typeinfo_typeflags_fappobject, &hf_typeinfo_typeflags_fcancreate, &hf_typeinfo_typeflags_flicensed, @@ -735,7 +735,7 @@ int dissect_ITypeInfo_GetDocumentation_rqst(tvbuff_t *tvb, int offset, guint32 u32TmpOffset; - static const int *flags[] = { + static int * const flags[] = { &hf_typeinfo_docflags_name, &hf_typeinfo_docflags_docstring, &hf_typeinfo_docflags_helpctx, diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 37d0cf49d6..02e55ccff6 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -1153,7 +1153,7 @@ dissect_dcom_SAFEARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 u32SubStart; guint32 u32TmpOffset; - static const int * features[] = { + static int * const features[] = { &hf_dcom_sa_features_variant, &hf_dcom_sa_features_dispatch, &hf_dcom_sa_features_unknown, diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index c0da77a774..d785b3bf39 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -86,7 +86,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint8 bpdu_type; proto_tree *bpdu_tree; proto_item *ti; - static const int * bpdu_flags[] = { + static int * const bpdu_flags[] = { &hf_dec_bpdu_flags_short_timers, &hf_dec_bpdu_flags_tcack, &hf_dec_bpdu_flags_tc, diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 9ab4ab61f3..304ac2609b 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -423,7 +423,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ break; } } else if (msg_flags & RT_FLAGS_LONG_MSG){ - const int * msg_bit_flags[] = { + static int * const msg_bit_flags[] = { &hf_dec_rt_long_msg, &hf_dec_rt_rqr, &hf_dec_rt_rts, @@ -678,7 +678,7 @@ do_hello_msg( guint16 version, eco_nr, user_eco; proto_item *ti; char *addr; - static const int * info_flags[] = { + static int * const info_flags[] = { &hf_dec_rt_iinfo_node_type, &hf_dec_rt_iinfo_vrf, &hf_dec_rt_iinfo_rej, diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index d49e7c50ad..4e0ac05ef3 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1528,14 +1528,14 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, break; case 3: /* Fixed Part Capabilities */ { - static const int * cap1_flags[] = { + static int * const cap1_flags[] = { &hf_dect_A_Tail_Qt_3_A12, &hf_dect_A_Tail_Qt_3_A13, &hf_dect_A_Tail_Qt_3_A14, &hf_dect_A_Tail_Qt_3_A15, NULL }; - static const int * cap2_flags[] = { + static int * const cap2_flags[] = { &hf_dect_A_Tail_Qt_3_A16, &hf_dect_A_Tail_Qt_3_A17, &hf_dect_A_Tail_Qt_3_A18, @@ -1546,7 +1546,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, &hf_dect_A_Tail_Qt_3_A23, NULL }; - static const int * cap3_flags[] = { + static int * const cap3_flags[] = { &hf_dect_A_Tail_Qt_3_A24, &hf_dect_A_Tail_Qt_3_A25, &hf_dect_A_Tail_Qt_3_A26, @@ -1557,7 +1557,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, &hf_dect_A_Tail_Qt_3_A31, NULL }; - static const int * cap4_flags[] = { + static int * const cap4_flags[] = { &hf_dect_A_Tail_Qt_3_A32, &hf_dect_A_Tail_Qt_3_A33, &hf_dect_A_Tail_Qt_3_A34, @@ -1569,7 +1569,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba, NULL }; - static const int * cap5_flags[] = { + static int * const cap5_flags[] = { &hf_dect_A_Tail_Qt_3_A40, &hf_dect_A_Tail_Qt_3_A41, &hf_dect_A_Tail_Qt_3_A42, diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index cd93c3e4a6..1f7a5216c2 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -2444,7 +2444,7 @@ dissect_dhcpopt_slp_service_scope(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t static int dissect_dhcpopt_client_full_domain_name(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - static const int * fqdn_hf_flags[] = { + static int * const fqdn_hf_flags[] = { &hf_dhcp_fqdn_mbz, &hf_dhcp_fqdn_n, &hf_dhcp_fqdn_e, @@ -3558,7 +3558,7 @@ dissect_vendor_pxeclient_suboption(packet_info *pinfo, proto_item *v_ti, proto_t NULL }; - static const int * o43pxe_discovery_hf_flags[] = { + static int * const o43pxe_discovery_hf_flags[] = { &hf_dhcp_option43_pxeclient_discovery_control_bc, &hf_dhcp_option43_pxeclient_discovery_control_mc, &hf_dhcp_option43_pxeclient_discovery_control_serverlist, @@ -4112,7 +4112,7 @@ rfc3825_fixpoint_to_decimal(struct rfc3825_location_fixpoint_t *fixpoint, struct static int dissect_dhcpopt_isns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - static const int *isns_functions_hf_flags[] = { + static int * const isns_functions_hf_flags[] = { &hf_dhcp_option_isns_functions_enabled, &hf_dhcp_option_isns_functions_dd_authorization, &hf_dhcp_option_isns_functions_sec_policy_distibution, @@ -4120,7 +4120,7 @@ dissect_dhcpopt_isns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* NULL }; - static const int *isns_dda_hf_flags[] = { + static int * const isns_dda_hf_flags[] = { &hf_dhcp_option_isns_discovery_domain_access_enabled, &hf_dhcp_option_isns_discovery_domain_access_control_node, &hf_dhcp_option_isns_discovery_domain_access_iscsi_target, @@ -4131,7 +4131,7 @@ dissect_dhcpopt_isns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* NULL }; - static const int *isns_administrative_flags[] = { + static int * const isns_administrative_flags[] = { &hf_dhcp_option_isns_administrative_flags_enabled, &hf_dhcp_option_isns_administrative_flags_heartbeat, &hf_dhcp_option_isns_administrative_flags_management_scns, @@ -4140,7 +4140,7 @@ dissect_dhcpopt_isns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* NULL }; - static const int *isns_server_security_flags[] = { + static int * const isns_server_security_flags[] = { &hf_dhcp_option_isns_server_security_bitmap_enabled, &hf_dhcp_option_isns_server_security_bitmap_ike_ipsec_enabled, &hf_dhcp_option_isns_server_security_bitmap_main_mode, @@ -4527,7 +4527,7 @@ static const value_string option43_bsdp_suboption_vals[] = { static void dissect_vendor_bsdp_boot_image(proto_tree *v_tree, tvbuff_t *tvb, int optoff) { - static const int * dhcp_o43_bsdp_attributes_flags[] = { + static int * const dhcp_o43_bsdp_attributes_flags[] = { &hf_dhcp_option43_bsdp_boot_image_attribute_install, &hf_dhcp_option43_bsdp_boot_image_attribute_kind, &hf_dhcp_option43_bsdp_boot_image_attribute_reserved, @@ -5747,7 +5747,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, packet_info *pinfo, tvbuff_t *tv } subtree = proto_item_add_subtree(ti, ett_dhcp_option); if (raw_val == PKT_MDC_PROV_FLOWS) { - static const int * flows[] = { + static int * const flows[] = { &hf_dhcp_pkt_mdc_supp_flow_secure, &hf_dhcp_pkt_mdc_supp_flow_hybrid, &hf_dhcp_pkt_mdc_supp_flow_basic, @@ -5790,7 +5790,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, packet_info *pinfo, tvbuff_t *tv switch (raw_val) { case PKT_MDC_MIB_CL: { - static const int * cl_flags[] = { + static int * const cl_flags[] = { &hf_dhcp_pkt_mdc_mib_cl_mta, &hf_dhcp_pkt_mdc_mib_cl_signaling, &hf_dhcp_pkt_mdc_mib_cl_management_event, @@ -5806,7 +5806,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, packet_info *pinfo, tvbuff_t *tv break; case PKT_MDC_MIB_IETF: { - static const int * ietf_flags[] = { + static int * const ietf_flags[] = { &hf_dhcp_pkt_mdc_mib_ietf_mta, &hf_dhcp_pkt_mdc_mib_ietf_signaling, &hf_dhcp_pkt_mdc_mib_ietf_management_event, @@ -5819,7 +5819,7 @@ dissect_packetcable_mta_cap(proto_tree *v_tree, packet_info *pinfo, tvbuff_t *tv break; case PKT_MDC_MIB_EURO: { - static const int * euro_flags[] = { + static int * const euro_flags[] = { &hf_dhcp_pkt_mdc_mib_euro_mta, &hf_dhcp_pkt_mdc_mib_euro_signaling, &hf_dhcp_pkt_mdc_mib_euro_management_event, @@ -6386,7 +6386,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len, gboo subtree = proto_item_add_subtree(ti, ett_dhcp_option); if (tlv_type == DOCSIS_CM_CAP_RNGHLDOFF_SUP && tlv_len >= 4) { - const int * flags[] = { + static int * const flags[] = { &hf_dhcp_docsis_cm_cap_ranging_hold_off_cm, &hf_dhcp_docsis_cm_cap_ranging_hold_off_eps, &hf_dhcp_docsis_cm_cap_ranging_hold_off_emta, @@ -6399,7 +6399,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len, gboo } if (tlv_type == DOCSIS_CM_CAP_USSYMRATE_SUP) { - const int * flags[] = { + static int * const flags[] = { &hf_dhcp_docsis_cm_cap_ussymrate_160, &hf_dhcp_docsis_cm_cap_ussymrate_320, &hf_dhcp_docsis_cm_cap_ussymrate_640, @@ -6413,7 +6413,7 @@ dissect_docsis_cm_cap(proto_tree *v_tree, tvbuff_t *tvb, int voff, int len, gboo } if (tlv_type == DOCSIS_CM_CAP_Opt802MPLSSup && tlv_len >= 4) { - const int * flags[] = { + static int * const flags[] = { &hf_dhcp_docsis_cm_cap_mpls_stpid, &hf_dhcp_docsis_cm_cap_mpls_svid, &hf_dhcp_docsis_cm_cap_mpls_spcp, @@ -6907,7 +6907,7 @@ dissect_dhcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint16 flags, secs; int offset_delta; guint8 overload = 0; /* DHCP option overload */ - static const int * dhcp_flags[] = { + static int * const dhcp_flags[] = { &hf_dhcp_flags_broadcast, &hf_dhcp_flags_reserved, NULL diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 06021b81d1..b8b3348dee 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -951,13 +951,13 @@ static const value_string failover_server_state_vals[] = { { 0, NULL }, }; -static const int *dhcpv6_failover_connect_flags_fields[] = { +static int * const dhcpv6_failover_connect_flags_fields[] = { &hf_option_failover_connect_reserved_flag, &hf_option_failover_connect_f_flag, NULL }; -static const int *dhcpv6_failover_dns_flags_fields[] = { +static int * const dhcpv6_failover_dns_flags_fields[] = { &hf_option_failover_dns_reserved_flag, &hf_option_failover_dns_u_flag, &hf_option_failover_dns_s_flag, @@ -966,7 +966,7 @@ static const int *dhcpv6_failover_dns_flags_fields[] = { NULL }; -static const int *dhcpv6_failover_server_flags_fields[] = { +static int * const dhcpv6_failover_server_flags_fields[] = { &hf_option_failover_server_reserved_flag, &hf_option_failover_server_a_flag, &hf_option_failover_server_s_flag, @@ -980,7 +980,7 @@ typedef struct hopcount_info_t { gboolean relay_message_previously_detected; } hopcount_info; -static const int *dhcpv6_s46_rule_flags_fields[] = { +static int * const dhcpv6_s46_rule_flags_fields[] = { &hf_option_s46_rule_reserved_flag, &hf_option_s46_rule_fmr_flag, NULL diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 139e5a5e90..6e048421aa 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -580,7 +580,7 @@ dissect_diameter_user_name(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static int dissect_diameter_mip6_feature_vector(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - const int *flags_rfc[] = { + static int * const flags_rfc[] = { &hf_diameter_mip6_feature_vector_mip6_integrated, &hf_diameter_mip6_feature_vector_local_home_agent_assignment, &hf_diameter_mip6_feature_vector_pmip6_supported, @@ -589,8 +589,8 @@ dissect_diameter_mip6_feature_vector(tvbuff_t *tvb, packet_info *pinfo _U_, prot NULL }; - const int *flags_3gpp[] = { - &hf_diameter_3gpp_mip6_feature_vector_assign_local_ip, + static int * const flags_3gpp[] = { + &hf_diameter_3gpp_mip6_feature_vector_assign_local_ip, &hf_diameter_3gpp_mip6_feature_vector_mip4_supported, &hf_diameter_3gpp_mip6_feature_vector_optimized_idle_mode_mobility, &hf_diameter_3gpp_mip6_feature_vector_gtpv2_supported, @@ -876,7 +876,7 @@ dissect_diameter_avp(diam_ctx_t *c, tvbuff_t *tvb, int offset, diam_sub_dis_t *d /* Flags */ { - static const int * diameter_avp_flags[] = { + static int * const diameter_avp_flags[] = { &hf_diameter_avp_flags_vendor_specific, &hf_diameter_avp_flags_mandatory, &hf_diameter_avp_flags_protected, @@ -1339,7 +1339,7 @@ static const char *msgflags_str[] = { "RP--", "RP-T", "RPE-", "RPET" }; -static const int *diameter_flags_fields[] = { +static int * const diameter_flags_fields[] = { &hf_diameter_flags_request, &hf_diameter_flags_proxyable, &hf_diameter_flags_error, diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index a4344372a4..9b486cb175 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -899,7 +899,7 @@ dissect_diameter_3gpp_feature_list_id(tvbuff_t *tvb, packet_info *pinfo _U_, pro static int dissect_diameter_3gpp_uar_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_uar_flags_flags_spare_bits, &hf_diameter_3gpp_uar_flags_flags_bit0, NULL @@ -919,7 +919,7 @@ dissect_diameter_3gpp_uar_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre * imscxdx.xml * IMS Cx Dx AVPS 3GPP TS 29.229 */ -static const int *diameter_3gpp_cx_feature_list_1_fields[] = { +static int * const diameter_3gpp_cx_feature_list_1_fields[] = { &hf_diameter_3gpp_cx_feature_list_1_flags_spare_bits, &hf_diameter_3gpp_cx_feature_list_1_flags_bit3, &hf_diameter_3gpp_cx_feature_list_1_flags_bit2, @@ -929,7 +929,7 @@ static const int *diameter_3gpp_cx_feature_list_1_fields[] = { }; /* 3GPP TS 29.212 V14.0.0 (2016-09) */ -static const int *diameter_3gpp_sd_feature_list_fields[] = { +static int * const diameter_3gpp_sd_feature_list_fields[] = { &hf_diameter_3gpp_feature_list_sd_flags_spare_bits, &hf_diameter_3gpp_feature_list_sd_flags_bit10, &hf_diameter_3gpp_feature_list_sd_flags_bit9, @@ -970,7 +970,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ { if (feature_list_id == 1) { /* 3GPP TS 129 214 Table 5.4.1.1: Features of Feature-List-ID 1 used in Rx */ - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list1_rx_flags_spare_bits, &hf_diameter_3gpp_feature_list1_rx_flags_bit22, &hf_diameter_3gpp_feature_list1_rx_flags_bit21, @@ -1001,7 +1001,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_diameter_3gpp_feature_list_flags, diameter_3gpp_feature_list_ett, flags, ENC_BIG_ENDIAN, BMT_NO_APPEND); } else if (feature_list_id == 2) { - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list2_rx_flags_spare_bits, &hf_diameter_3gpp_feature_list2_rx_flags_bit4, &hf_diameter_3gpp_feature_list2_rx_flags_bit3, @@ -1017,7 +1017,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ break; case DIAM_APPID_3GPP_SH: { - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list1_sh_flags_spare_bits, &hf_diameter_3gpp_feature_list1_sh_flags_bit3, &hf_diameter_3gpp_feature_list1_sh_flags_bit2, @@ -1032,7 +1032,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ case DIAM_APPID_3GPP_S6A_S6D: if (feature_list_id == 1) { /* 3GPP TS 29.272 Table 7.3.10/1: Features of Feature-List-ID 1 used in S6a/S6d */ - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list1_s6a_flags_bit31, &hf_diameter_3gpp_feature_list1_s6a_flags_bit30, &hf_diameter_3gpp_feature_list1_s6a_flags_bit29, @@ -1072,7 +1072,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ } else if (feature_list_id == 2) { /* 3GPP TS 29.272 Table 7.3.10/2: Features of Feature-List-ID 2 used in S6a/S6d */ - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list2_s6a_flags_spare_bits, &hf_diameter_3gpp_feature_list2_s6a_flags_bit27, &hf_diameter_3gpp_feature_list2_s6a_flags_bit26, @@ -1111,7 +1111,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ case DIAM_APPID_3GPP_GX: /* 3GPP TS 29.212 V15.1.0 (2017-12) */ if (feature_list_id == 1) { /* 3GPP TS 29.212 Table 5.4.1.1: Features of Feature-List-ID 1 used in Gx */ - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list1_gx_flags_bit31, &hf_diameter_3gpp_feature_list1_gx_flags_bit30, &hf_diameter_3gpp_feature_list1_gx_flags_bit29, @@ -1152,7 +1152,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ } else if (feature_list_id == 2) { /* 3GPP TS 29.212 Table 5.4.1.2: Features of Feature-List-ID 2 used in Gx */ - const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_feature_list2_gx_flags_bit7, &hf_diameter_3gpp_feature_list2_gx_flags_bit6, &hf_diameter_3gpp_feature_list2_gx_flags_bit5, @@ -1174,7 +1174,7 @@ dissect_diameter_3gpp_feature_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ break; case DIAM_APPID_3GPP_S6T: { - const int* flags[] = { + int* const flags[] = { &hf_diameter_3gpp_feature_list_s6t_spare_b31_b8, &hf_diameter_3gpp_feature_list_s6t_flags_bit7, &hf_diameter_3gpp_feature_list_s6t_flags_bit6, @@ -1268,7 +1268,7 @@ dissect_diameter_3gpp_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * * IMS Cx Dx AVPS 3GPP TS 29.229 */ -static const int *diameter_3gpp_sar_fields[] = { +static int * const diameter_3gpp_sar_fields[] = { &hf_diameter_3gpp_sar_flags_flags_bit0, NULL }; @@ -1342,7 +1342,7 @@ static int dissect_diameter_3gpp_req_nodes(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, void* data) { - static const int* diameter_3gpp_req_nodes_fields[] = { + static int* const diameter_3gpp_req_nodes_fields[] = { &hf_diameter_3gpp_req_nodes_bit3, &hf_diameter_3gpp_req_nodes_bit2, &hf_diameter_3gpp_req_nodes_bit1, @@ -1563,7 +1563,7 @@ dissect_diameter_3gpp_monitoring_key(tvbuff_t *tvb, packet_info *pinfo _U_, prot static int dissect_diameter_3gpp_credit_management_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_cms_spare_bits, &hf_diameter_3gpp_cms_no_gyn_session_serv_not_allowed, &hf_diameter_3gpp_cms_no_gyn_session_serv_allowed, @@ -1921,7 +1921,7 @@ dissect_diameter_3ggp_qos_susbscribed(tvbuff_t *tvb, packet_info *pinfo _U_, pro static int dissect_diameter_3gpp_ulr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_ulr_flags_spare_bits, &hf_diameter_3gpp_ulr_flags_bit8, &hf_diameter_3gpp_ulr_flags_bit7, @@ -1948,7 +1948,7 @@ dissect_diameter_3gpp_ulr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_ula_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_ula_flags_spare_bits, &hf_diameter_3gpp_ula_flags_bit1, &hf_diameter_3gpp_ula_flags_bit0, @@ -1987,7 +1987,7 @@ dissect_diameter_3gpp_visited_plmn_id(tvbuff_t *tvb, packet_info *pinfo, proto_t static int dissect_diameter_3gpp_dsr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_dsr_flags_bit31, &hf_diameter_3gpp_dsr_flags_bit30, &hf_diameter_3gpp_dsr_flags_bit29, @@ -2036,7 +2036,7 @@ dissect_diameter_3gpp_dsr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_dsa_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_dsa_flags_spare_bits, &hf_diameter_3gpp_dsa_flags_bit0, NULL @@ -2055,7 +2055,7 @@ dissect_diameter_3gpp_dsa_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_acc_res_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_acc_res_dat_flags_spare_bits, &hf_diameter_3gpp_acc_res_dat_flags_bit10, &hf_diameter_3gpp_acc_res_dat_flags_bit9, @@ -2085,7 +2085,7 @@ dissect_diameter_3gpp_acc_res_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ static int dissect_diameter_3gpp_ida_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_ida_flags_spare_bits, &hf_diameter_3gpp_ida_flags_bit0, NULL @@ -2099,7 +2099,7 @@ dissect_diameter_3gpp_ida_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_pua_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_pua_flags_spare_bits, &hf_diameter_3gpp_pua_flags_bit1, &hf_diameter_3gpp_pua_flags_bit0, @@ -2119,7 +2119,7 @@ dissect_diameter_3gpp_pua_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_nor_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_nor_flags_spare_bits, &hf_diameter_3gpp_nor_flags_bit9, &hf_diameter_3gpp_nor_flags_bit8, @@ -2148,7 +2148,7 @@ dissect_diameter_3gpp_nor_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_idr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_idr_flags_spare_bits, &hf_diameter_3gpp_idr_flags_bit8, &hf_diameter_3gpp_idr_flags_bit7, @@ -2175,7 +2175,7 @@ dissect_diameter_3gpp_idr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_ppr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_ppr_flags_spare_bits, &hf_diameter_3gpp_ppr_flags_bit3, &hf_diameter_3gpp_ppr_flags_bit2, @@ -2198,7 +2198,7 @@ dissect_diameter_3gpp_ppr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_aaa_fail_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_aaa_fail_flags_spare_bits, &hf_diameter_3gpp_aaa_fail_flags_bit0, NULL @@ -2218,7 +2218,7 @@ dissect_diameter_3gpp_aaa_fail_flags(tvbuff_t *tvb, packet_info *pinfo _U_, prot static int dissect_diameter_3gpp_der_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_der_flags_spare_bits, &hf_diameter_3gpp_der_flags_bit1, &hf_diameter_3gpp_der_flags_bit0, @@ -2238,7 +2238,7 @@ dissect_diameter_3gpp_der_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_dea_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_dea_flags_spare_bits, &hf_diameter_3gpp_dea_flags_bit1, &hf_diameter_3gpp_dea_flags_bit0, @@ -2258,7 +2258,7 @@ dissect_diameter_3gpp_dea_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_rar_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_rar_flags_spare_bits, &hf_diameter_3gpp_rar_flags_bit1, &hf_diameter_3gpp_rar_flags_bit0, @@ -2278,7 +2278,7 @@ dissect_diameter_3gpp_rar_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_der_s6b_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_der_s6b_flags_spare_bits, &hf_diameter_3gpp_der_s6b_flags_bit0, NULL @@ -2298,7 +2298,7 @@ dissect_diameter_3gpp_der_s6b_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto static int dissect_diameter_3gpp_emergency_services(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_emergency_services_flags_spare_bits, &hf_diameter_3gpp_emergency_services_flags_bit0, NULL @@ -2321,7 +2321,7 @@ dissect_diameter_3gpp_emergency_services(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_diameter_3gpp_pur_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_pur_flags_spare_bits, &hf_diameter_3gpp_pur_flags_bit1, &hf_diameter_3gpp_pur_flags_bit0, @@ -2345,7 +2345,7 @@ dissect_diameter_3gpp_pur_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_clr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_clr_flags_spare_bits, &hf_diameter_3gpp_clr_flags_bit1, &hf_diameter_3gpp_clr_flags_bit0, @@ -2368,7 +2368,7 @@ dissect_diameter_3gpp_clr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_uvr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_uvr_flags_spare_bits, &hf_diameter_3gpp_uvr_flags_bit0, NULL @@ -2390,7 +2390,7 @@ dissect_diameter_3gpp_uvr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_uva_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_uva_flags_spare_bits, &hf_diameter_3gpp_uva_flags_bit0, NULL @@ -2412,7 +2412,7 @@ dissect_diameter_3gpp_uva_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_subscription_data_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_subscription_data_flags_spare_bits, &hf_diameter_3gpp_subscription_data_flags_bit3, &hf_diameter_3gpp_subscription_data_flags_bit2, @@ -2437,7 +2437,7 @@ dissect_diameter_3gpp_subscription_data_flags(tvbuff_t *tvb, packet_info *pinfo static int dissect_diameter_3gpp_wlan_offloadability_eutran(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_wlan_offloadability_eutran_spare_bits, &hf_diameter_3gpp_wlan_offloadability_eutran_bit0, NULL @@ -2459,7 +2459,7 @@ dissect_diameter_3gpp_wlan_offloadability_eutran(tvbuff_t *tvb, packet_info *pin static int dissect_diameter_3gpp_wlan_offloadability_utran(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_wlan_offloadability_utran_spare_bits, &hf_diameter_3gpp_wlan_offloadability_utran_bit0, NULL @@ -2501,7 +2501,7 @@ dissect_diameter_3gpp_group_plmn_id(tvbuff_t *tvb, packet_info *pinfo, proto_tre static int dissect_diameter_3gpp_air_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_air_flags_spare_bits, &hf_diameter_3gpp_air_flags_bit0, NULL @@ -2523,7 +2523,7 @@ dissect_diameter_3gpp_air_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_preferred_data_mode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_preferred_data_mode_spare_bits, &hf_diameter_3gpp_preferred_data_mode_bit1, &hf_diameter_3gpp_preferred_data_mode_bit0, @@ -2546,7 +2546,7 @@ dissect_diameter_3gpp_preferred_data_mode(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_diameter_3gpp_v2x_permission(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_v2x_permission_spare_bits, &hf_diameter_3gpp_v2x_permission_bit1, &hf_diameter_3gpp_v2x_permission_bit0, @@ -2569,7 +2569,7 @@ dissect_diameter_3gpp_v2x_permission(tvbuff_t *tvb, packet_info *pinfo _U_, prot int dissect_diameter_3gpp_core_network_restrictions(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_core_network_restrictions_spare_bits, &hf_diameter_3gpp_core_network_restrictions_bit1, &hf_diameter_3gpp_core_network_restrictions_bit0, @@ -2590,7 +2590,7 @@ dissect_diameter_3gpp_core_network_restrictions(tvbuff_t *tvb, packet_info *pinf static int dissect_diameter_3gpp_supported_gad_shapes(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, void* data) { - static const int* flags[] = { + static int* const flags[] = { &hf_diameter_3gpp_highaccuracyellipsoidpointwithaltitudeanduncertaintyellipsoid_bit8, &hf_diameter_3gpp_highaccuracyellipsoidpointwithuncertaintyellipse_bit7, &hf_diameter_3gpp_ellipsoidarc_bit6, @@ -2622,7 +2622,7 @@ dissect_diameter_3gpp_eutran_positioning_data(tvbuff_t *tvb, packet_info *pinfo, /* AVP Code: 2530 LRR-Flags */ /* - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_lrr_flags_spare_bits, &hf_diameter_3gpp_mo_lr_shortcircuit_req_bit2, &hf_diameter_3gpp_mo_lr_shortcircuit_ind_bit1, @@ -2635,7 +2635,7 @@ dissect_diameter_3gpp_eutran_positioning_data(tvbuff_t *tvb, packet_info *pinfo, static int dissect_diameter_3gpp_deferred_location_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_deferred_location_type_spare_bits, &hf_diameter_3gpp_maximum_interval_exporation_bit7, &hf_diameter_3gpp_ldr_activated_bit6, @@ -2662,7 +2662,7 @@ dissect_diameter_3gpp_deferred_location_type(tvbuff_t *tvb, packet_info *pinfo _ static int dissect_diameter_3gpp_plr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_plr_flags_spare_bits, &hf_diameter_3gpp_delayed_location_reporting_support_indicator_bit2, &hf_diameter_3gpp_optimized_lcs_proc_req_bit1, @@ -2683,7 +2683,7 @@ dissect_diameter_3gpp_plr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static int dissect_diameter_3gpp_pla_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_pla_flags_spare_bits, &hf_diameter_3gpp_ue_transiently_not_reachable_indicator_bit3, &hf_diameter_3gpp_optimized_lcs_proc_performed_bit2, @@ -2802,7 +2802,7 @@ static int dissect_diameter_3gpp_supported_monitoring_events(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, void* data) { /* Unsigned64 */ - static const int* flags[] = { + static int* const flags[] = { &hf_diameter_3gpp_supported_monitoring_events_b8, &hf_diameter_3gpp_supported_monitoring_events_b7, &hf_diameter_3gpp_supported_monitoring_events_b6, @@ -2828,7 +2828,7 @@ dissect_diameter_3gpp_supported_monitoring_events(tvbuff_t* tvb, packet_info* pi static int dissect_diameter_3gpp_rir_flags(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, void* data) { - static const int* flags[] = { + static int* const flags[] = { &hf_diameter_3gpp_rir_spare_b31_b4, &hf_diameter_3gpp_acpc, &hf_diameter_3gpp_coame, @@ -2897,7 +2897,7 @@ dissect_diameter_3gpp_sm_rp_ui(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr static int dissect_diameter_3gpp_mbms_bearer_event(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_mbms_bearer_event_spare_bits, &hf_diameter_3gpp_mbms_bearer_event_bit2, &hf_diameter_3gpp_mbms_bearer_event_bit1, @@ -2918,7 +2918,7 @@ dissect_diameter_3gpp_mbms_bearer_event(tvbuff_t *tvb, packet_info *pinfo _U_, p static int dissect_diameter_3gpp_mbms_bearer_result(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_mbms_bearer_result_spare_bits, &hf_diameter_3gpp_mbms_bearer_result_bit11, &hf_diameter_3gpp_mbms_bearer_result_bit10, @@ -2948,7 +2948,7 @@ dissect_diameter_3gpp_mbms_bearer_result(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_diameter_3gpp_tmgi_allocation_result(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_tmgi_allocation_result_spare_bits, &hf_diameter_3gpp_tmgi_allocation_result_bit4, &hf_diameter_3gpp_tmgi_allocation_result_bit3, @@ -2971,7 +2971,7 @@ dissect_diameter_3gpp_tmgi_allocation_result(tvbuff_t *tvb, packet_info *pinfo _ static int dissect_diameter_3gpp_tmgi_deallocation_result(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { - static const int *flags[] = { + static int * const flags[] = { &hf_diameter_3gpp_tmgi_deallocation_result_spare_bits, &hf_diameter_3gpp_tmgi_deallocation_result_bit2, &hf_diameter_3gpp_tmgi_deallocation_result_bit1, diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c index a2522b5214..7a204652b4 100644 --- a/epan/dissectors/packet-dis.c +++ b/epan/dissectors/packet-dis.c @@ -5135,7 +5135,7 @@ static gint parse_Link16_Message_Data(proto_tree *tree, tvbuff_t *tvb, gint offs Link16State state; tvbuff_t *newtvb; - static const int * jtids_message_header_fields[] = { + static int * const jtids_message_header_fields[] = { &hf_dis_signal_link16_time_slot_type, &hf_dis_signal_link16_rti, &hf_dis_signal_link16_stn, @@ -5959,7 +5959,7 @@ static int dissect_DIS_PARSER_ENTITY_STATE_PDU(tvbuff_t *tvb, packet_info *pinfo if ((entityKind == DIS_ENTITYKIND_PLATFORM) && (entityDomain == DIS_DOMAIN_LAND)) { - static const int *entity_appearance_domain_land_bitmask[] = + static int * const entity_appearance_domain_land_bitmask[] = { &hf_appearance_landform_paint_scheme, &hf_appearance_landform_mobility, @@ -5993,7 +5993,7 @@ static int dissect_DIS_PARSER_ENTITY_STATE_PDU(tvbuff_t *tvb, packet_info *pinfo } else if (entityKind == DIS_ENTITYKIND_LIFE_FORM) { - static const int *entity_appearance_kind_life_form_bitmask[] = + static int * const entity_appearance_kind_life_form_bitmask[] = { &hf_appearance_lifeform_paint_scheme, &hf_appearance_lifeform_health, @@ -6134,7 +6134,7 @@ static int dissect_DIS_PARSER_ENTITY_STATE_UPDATE_PDU(tvbuff_t *tvb, packet_info if ((entityKind == DIS_ENTITYKIND_PLATFORM) && (entityDomain == DIS_DOMAIN_LAND)) { - static const int *entity_appearance_domain_land_bitmask[] = + static int * const entity_appearance_domain_land_bitmask[] = { &hf_appearance_landform_paint_scheme, &hf_appearance_landform_mobility, @@ -6168,7 +6168,7 @@ static int dissect_DIS_PARSER_ENTITY_STATE_UPDATE_PDU(tvbuff_t *tvb, packet_info } else if (entityKind == DIS_ENTITYKIND_LIFE_FORM) { - static const int *entity_appearance_kind_life_form_bitmask[] = + static int * const entity_appearance_kind_life_form_bitmask[] = { &hf_appearance_lifeform_paint_scheme, &hf_appearance_lifeform_health, diff --git a/epan/dissectors/packet-dlep.c b/epan/dissectors/packet-dlep.c index 0e8a02a437..f1a8d17b41 100644 --- a/epan/dissectors/packet-dlep.c +++ b/epan/dissectors/packet-dlep.c @@ -813,7 +813,7 @@ decode_dataitem_mtu(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt, i decode_dataitem_hop_cnt(tvbuff_t *tvb, int offset, proto_item *pi, proto_tree *pt, int len, packet_info *pinfo) { proto_item *pi_field = NULL; - static const int * hop_cnt_flags[] = { + static int * const hop_cnt_flags[] = { &hf_dlep_dataitem_hop_count_flags_p, &hf_dlep_dataitem_hop_count_flags_reserved, NULL diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 59f5738dce..e028548a3d 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -431,7 +431,7 @@ static const value_string dlm3_rs[] = { * Fields */ -static const int *m_exflags_fields[] = { +static int * const m_exflags_fields[] = { &hf_dlm3_m_exflags_timeout, &hf_dlm3_m_exflags_forceunlock, &hf_dlm3_m_exflags_altcw, @@ -454,31 +454,31 @@ static const int *m_exflags_fields[] = { NULL }; -static const int *rs_flags_fields[] = { +static int * const rs_flags_fields[] = { &hf_dlm3_rs_flags_need_slots, NULL }; -static const int *m_sbflags_fields[] = { +static int * const m_sbflags_fields[] = { &hf_dlm3_m_sbflags_altmode, &hf_dlm3_m_sbflags_valnotvalid, &hf_dlm3_m_sbflags_demoted, NULL }; -static const int *m_flags_fields[] = { +static int * const m_flags_fields[] = { &hf_dlm3_m_flags_orphan, &hf_dlm3_m_flags_user, NULL }; -static const int *m_asts_fields[] = { +static int * const m_asts_fields[] = { &hf_dlm3_m_asts_bast, &hf_dlm3_m_asts_comp, NULL }; -static const int *rf_lsflags_fields[] = { +static int * const rf_lsflags_fields[] = { &hf_dlm3_rf_lsflags_timeout, &hf_dlm3_rf_lsflags_forceunlock, &hf_dlm3_rf_lsflags_altcw, @@ -501,7 +501,7 @@ static const int *rf_lsflags_fields[] = { NULL }; -static const int *rl_exflags_fields[] = { +static int * const rl_exflags_fields[] = { &hf_dlm3_rl_exflags_timeout, &hf_dlm3_rl_exflags_forceunlock, &hf_dlm3_rl_exflags_altcw, @@ -524,13 +524,13 @@ static const int *rl_exflags_fields[] = { NULL }; -static const int *rl_flags_fields[] = { +static int * const rl_flags_fields[] = { &hf_dlm3_rl_flags_orphan, &hf_dlm3_rl_flags_user, NULL }; -static const int *rl_asts_fields[] = { +static int * const rl_asts_fields[] = { &hf_dlm3_rl_asts_bast, &hf_dlm3_rl_asts_comp, NULL diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index a1aaa87d0e..4d0e031251 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -464,7 +464,7 @@ dissect_dlsw_capex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tr case 0x86: while (i<vlen-2) { - static const int * flags[] = { + static int * const flags[] = { &hf_dlsw_sap_list_support_x0, &hf_dlsw_sap_list_support_x2, &hf_dlsw_sap_list_support_x4, diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 39c6e7f41d..35bd449093 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -1423,7 +1423,7 @@ dnp3_al_process_iin(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *a { guint16 al_iin; proto_item *tiin; - static const int* indications[] = { + static int* const indications[] = { &hf_dnp3_al_iin_rst, &hf_dnp3_al_iin_dt, &hf_dnp3_al_iin_dol, @@ -2941,7 +2941,7 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *al_tree, *robj_tree; const gchar *func_code_str, *obj_type_str; nstime_t al_cto; - static const int * control_flags[] = { + static int * const control_flags[] = { &hf_dnp3_al_fir, &hf_dnp3_al_fin, &hf_dnp3_al_con, @@ -3321,7 +3321,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* gboolean crc_OK = FALSE; tvbuff_t *next_tvb; guint i; - static const int * transport_flags[] = { + static int * const transport_flags[] = { &hf_dnp3_tr_fin, &hf_dnp3_tr_fir, &hf_dnp3_tr_seq, diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 7ceca8de69..623d7d61e9 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1167,7 +1167,7 @@ const value_string dns_classes[] = { {0,NULL} }; -static const int *dns_csync_flags[] = { +static int * const dns_csync_flags[] = { &hf_dns_csync_flags_immediate, &hf_dns_csync_flags_soaminimum, NULL diff --git a/epan/dissectors/packet-docsis-macmgmt.c b/epan/dissectors/packet-docsis-macmgmt.c index c026c5fe73..1dfd844e48 100644 --- a/epan/dissectors/packet-docsis-macmgmt.c +++ b/epan/dissectors/packet-docsis-macmgmt.c @@ -3004,7 +3004,7 @@ dissect_any_ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, int pro case UCD_RANGING_HOLD_OFF_PRIORITY_FIELD: if (length == 4) { - static const int * ucd_rnghoff[] = { + static int * const ucd_rnghoff[] = { &hf_docsis_ucd_rnghoff_cm, &hf_docsis_ucd_rnghoff_erouter, &hf_docsis_ucd_rnghoff_emta, @@ -3024,7 +3024,7 @@ dissect_any_ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, int pro case UCD_RANGING_CHANNEL_CLASS_ID: if (length == 4) { - static const int * ucd_chan_class_id[] = { + static int * const ucd_chan_class_id[] = { &hf_docsis_ucd_chan_class_id_cm, &hf_docsis_ucd_chan_class_id_erouter, &hf_docsis_ucd_chan_class_id_emta, @@ -3096,7 +3096,7 @@ dissect_any_ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, int pro case UCD_OFDMA_TIMESTAMP_SNAPSHOT: if (length == 9) { - static const int* timestamp_snapshot_parts[] = { + static int* const timestamp_snapshot_parts[] = { &hf_docsis_ucd_ofdma_timestamp_snapshot_reserved, &hf_docsis_ucd_ofdma_timestamp_snapshot_d30timestamp, &hf_docsis_ucd_ofdma_timestamp_snapshot_4msbits_of_div20, @@ -3215,14 +3215,14 @@ dissect_any_map (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, guint8 int pos; proto_item *it; proto_tree *map_tree; - static const int * ies[] = { + static int * const ies[] = { &hf_docsis_map_sid, &hf_docsis_map_iuc, &hf_docsis_map_offset, NULL }; - static const int * probe_ies[] = { + static int * const probe_ies[] = { &hf_docsis_map_sid, &hf_docsis_map_mer, &hf_docsis_map_pw, @@ -5095,19 +5095,19 @@ dissect_mdd_ds_active_channel_list(tvbuff_t * tvb, packet_info* pinfo _U_, proto proto_tree *mdd_tree; proto_item *mdd_item; int pos; - static const int * order_annex[] = { + static int * const order_annex[] = { &hf_docsis_mdd_downstream_active_channel_list_modulation_order, &hf_docsis_mdd_downstream_active_channel_list_annex, NULL }; - static const int * cm_status_event[] = { + static int * const cm_status_event[] = { &hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_timeout, &hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_failure, &hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_recovery, &hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_recovery, NULL }; - static const int * ofdm_plc_parameters[] = { + static int * const ofdm_plc_parameters[] = { &hf_docsis_mdd_ofdm_plc_parameters_tukey_raised_cosine_window, &hf_docsis_mdd_ofdm_plc_parameters_cyclic_prefix, &hf_docsis_mdd_ofdm_plc_parameters_sub_carrier_spacing, @@ -5297,7 +5297,7 @@ dissect_mdd_upstream_active_channel_list(tvbuff_t * tvb, packet_info* pinfo _U_, proto_tree *mdd_tree; proto_item *mdd_item; int pos; - static const int * cm_status_event[] = { + static int * const cm_status_event[] = { &hf_docsis_mdd_cm_status_event_enable_bitmask_t4_timeout, &hf_docsis_mdd_cm_status_event_enable_bitmask_t3_retries_exceeded, &hf_docsis_mdd_cm_status_event_enable_bitmask_successful_ranging_after_t3_retries_exceeded, @@ -5590,7 +5590,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data proto_tree *tlv_tree; proto_item *tlv_item; - static const int * non_channel_events[] = { + static int * const non_channel_events[] = { &hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_sequence_out_of_range, &hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_operating_on_battery_backup, &hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_returned_to_ac_power, @@ -5697,7 +5697,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data break; case CM_STATUS_EVENT_ENABLE_FOR_DOCSIS_3_1_EVENTS: if (length == 4) { - static const int * mdd_cm_status_event_d31[] = { + static int * const mdd_cm_status_event_d31[] = { &hf_docsis_mdd_cm_status_event_d31_ofdm_prof_fail, &hf_docsis_mdd_cm_status_event_d31_prim_down_chan_change, &hf_docsis_mdd_cm_status_event_d31_dpd_mismatch, @@ -7021,7 +7021,7 @@ dissect_optreq_tlv (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 1) { - static const int * req_stat[] = { + static int * const req_stat[] = { &hf_docsis_optreq_reqstat_rxmer_stat_subc, &hf_docsis_optreq_reqstat_rxmer_subc_threshold_comp, &hf_docsis_optreq_reqstat_snr_marg_cand_prof, @@ -7288,7 +7288,7 @@ dissect_rba (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data guint32 tg_id, dcid; guint32 subband_index, nr_of_subbands; - static const int * rba_control_byte[] = { + static int * const rba_control_byte[] = { &hf_docsis_rba_resource_block_change_bit, &hf_docsis_rba_expiration_time_valid_bit, &hf_docsis_rba_control_byte_bitmask_rsvd, @@ -7332,7 +7332,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* d set_address_tvb (&pinfo->dl_dst, AT_ETHER, 6, tvb, 0); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); - static const int * multipart_field[] = { + static int * const multipart_field[] = { &hf_docsis_mgt_multipart_number_of_fragments, &hf_docsis_mgt_multipart_fragment_sequence_number, NULL diff --git a/epan/dissectors/packet-docsis-tlv.c b/epan/dissectors/packet-docsis-tlv.c index b4319e5f98..7784ea8328 100644 --- a/epan/dissectors/packet-docsis-tlv.c +++ b/epan/dissectors/packet-docsis-tlv.c @@ -1181,7 +1181,7 @@ static const true_false_string tfs_must_must_not = { "MUST", "MUST NOT" }; static void dissect_reqxmit_policy (tvbuff_t * tvb, proto_tree * tree, int start) { - static const gint *requests[] = { + static int * const requests[] = { &hf_docsis_tlv_sflow_reqxmit_all_cm_broadcast, &hf_docsis_tlv_sflow_reqxmit_priority_multicast, &hf_docsis_tlv_sflow_reqxmit_req_data_requests, @@ -2791,7 +2791,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_EM: if (length == 4) { - static const int * cap_em[] = { + static int * const cap_em[] = { &hf_docsis_tlv_mcap_em_1x1, &hf_docsis_tlv_mcap_em_light_sleep, NULL @@ -2818,7 +2818,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_EM_PREF: if (length == 4) { - static const gint *em_pref[] = { + static int * const em_pref[] = { &hf_docsis_tlv_mcap_em_pref_1x1, &hf_docsis_tlv_mcap_em_pref_dls, NULL @@ -2879,7 +2879,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_DOWN_OFDM_CHAN_SUBC_QAM_MOD_SUP: if (length == 2) { - static const gint *ofdm_qam_mod_sup[] = { + static int * const ofdm_qam_mod_sup[] = { &hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_reserved, &hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_qpsk, &hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_16qam, @@ -2906,7 +2906,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_UP_OFDMA_CHAN_SUBC_QAM_MOD_SUP: if (length == 2) { - static const gint *ofdma_qam_mod_sup[] = { + static int * const ofdma_qam_mod_sup[] = { &hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_reserved, &hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_qpsk, &hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_8qam, @@ -2935,7 +2935,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_DOWN_LOWER_BAND_EDGE_CONF: if (length == 1) { - static const gint *down_lower_band_edge_conf[] = { + static int * const down_lower_band_edge_conf[] = { &hf_docsis_tlv_mcap_down_lower_band_edge_conf_108, &hf_docsis_tlv_mcap_down_lower_band_edge_conf_258, NULL @@ -2952,7 +2952,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_DOWN_UPPER_BAND_EDGE_CONF: if (length == 1) { - static const gint *down_upper_band_edge_conf[] = { + static int * const down_upper_band_edge_conf[] = { &hf_docsis_tlv_mcap_down_upper_band_edge_conf_1218, &hf_docsis_tlv_mcap_down_upper_band_edge_conf_1794, &hf_docsis_tlv_mcap_down_upper_band_edge_conf_1002, @@ -3014,7 +3014,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_DIPL_DOWN_LOWER_BAND_EDGE: if (length == 1) { - static const gint *dipl_down_lower_band_edge[] = { + static int * const dipl_down_lower_band_edge[] = { &hf_docsis_tlv_mcap_dipl_down_lower_band_edge_108, &hf_docsis_tlv_mcap_dipl_down_lower_band_edge_258, NULL @@ -3031,7 +3031,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_DIPL_DOWN_UPPER_BAND_EDGE: if (length == 1) { - static const gint *dipl_down_upper_band_edge[] = { + static int * const dipl_down_upper_band_edge[] = { &hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1218, &hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1794, &hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1002, @@ -3049,7 +3049,7 @@ dissect_modemcap (tvbuff_t * tvb, packet_info* pinfo, proto_tree * tree, int sta case CAP_DIPL_UP_UPPER_BAND_EDGE: if (length == 1) { - static const gint *dipl_up_upper_band_edge[] = { + static int * const dipl_up_upper_band_edge[] = { &hf_docsis_tlv_mcap_dipl_up_upper_band_edge_42, &hf_docsis_tlv_mcap_dipl_up_upper_band_edge_65, &hf_docsis_tlv_mcap_dipl_up_upper_band_edge_85, diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index 7b64bc6038..99827d9475 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -935,7 +935,7 @@ static int hf_2009_9_dnp_1_dstport = -1; static int ett_2009_9_dnp_1_flags = -1; -static const int *bitmask_2009_9_dnp_1_flags[] = { +static int * const bitmask_2009_9_dnp_1_flags[] = { &hf_2009_9_dnp_1_flag_length, &hf_2009_9_dnp_1_flag_srcport, &hf_2009_9_dnp_1_flag_dstport, @@ -1209,7 +1209,7 @@ static int ett_oap_1_cmdcontrol_flags = -1; static int ett_oap_1_cmdcontrol_ack = -1; static int ett_oap_1_alias = -1; -static const int *bitmask_oap_1_cmdcontrol_flags[] = { +static int * const bitmask_oap_1_cmdcontrol_flags[] = { &hf_oap_1_cmdcontrol_cache_flag, &hf_oap_1_cmdcontrol_verbosity_flag, &hf_oap_1_cmdcontrol_noexecute_flag, diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 1bf0e2522b..a14533ce76 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -352,7 +352,7 @@ static void append_oid(packet_info *pinfo, const char *oid) /*--- Included file: packet-dop-fn.c ---*/ #line 1 "./asn1/dop/packet-dop-fn.c" -static const int * DSEType_bits[] = { +static int * const DSEType_bits[] = { &hf_dop_DSEType_root, &hf_dop_DSEType_glue, &hf_dop_DSEType_cp, @@ -1774,7 +1774,7 @@ dissect_dop_UserClasses(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * GrantsAndDenials_bits[] = { +static int * const GrantsAndDenials_bits[] = { &hf_dop_GrantsAndDenials_grantAdd, &hf_dop_GrantsAndDenials_denyAdd, &hf_dop_GrantsAndDenials_grantDiscloseOnError, diff --git a/epan/dissectors/packet-dpaux.c b/epan/dissectors/packet-dpaux.c index f79b89ff0e..5734a82dd8 100644 --- a/epan/dissectors/packet-dpaux.c +++ b/epan/dissectors/packet-dpaux.c @@ -35,7 +35,7 @@ static int hf_dpaux_reg_addr = -1; static int hf_00000 = -1; static int hf_00000_MINOR = -1; static int hf_00000_MAJOR = -1; -static const int *reg00000_fields[] = { +static int * const reg00000_fields[] = { &hf_00000_MAJOR, &hf_00000_MINOR, NULL @@ -43,7 +43,7 @@ static const int *reg00000_fields[] = { static int hf_00001 = -1; static int hf_00001_MAX_LINK_RATE = -1; -static const int *reg00001_fields[] = { +static int * const reg00001_fields[] = { &hf_00001_MAX_LINK_RATE, NULL }; @@ -53,7 +53,7 @@ static int hf_00002_MAX_LANE_COUNT = -1; static int hf_00002_POST_LT_ADJ_REQ_SUPPORTED = -1; static int hf_00002_TPS3_SUPPORTED = -1; static int hf_00002_ENHANCED_FRAME_CAP = -1; -static const int *reg00002_fields[] = { +static int * const reg00002_fields[] = { &hf_00002_MAX_LANE_COUNT, &hf_00002_POST_LT_ADJ_REQ_SUPPORTED, &hf_00002_TPS3_SUPPORTED, @@ -65,7 +65,7 @@ static int hf_00003 = -1; static int hf_00003_MAX_DOWNSPREAD = -1; static int hf_00003_NO_AUX_TRANSACTION_LINK_TRAINING = -1; static int hf_00003_TPS4_SUPPORTED = -1; -static const int *reg00003_fields[] = { +static int * const reg00003_fields[] = { &hf_00003_MAX_DOWNSPREAD, &hf_00003_NO_AUX_TRANSACTION_LINK_TRAINING, &hf_00003_TPS4_SUPPORTED, @@ -77,7 +77,7 @@ static int hf_00004_NORP = -1; static int hf_00004_5V_DP_PWR_CAP = -1; static int hf_00004_12V_DP_PWR_CAP = -1; static int hf_00004_18V_DP_PWR_CAP = -1; -static const int *reg00004_fields[] = { +static int * const reg00004_fields[] = { &hf_00004_NORP, &hf_00004_5V_DP_PWR_CAP, &hf_00004_12V_DP_PWR_CAP, @@ -115,7 +115,7 @@ enum { struct bitfield_data { int *hf; - const int **fields; + int * const *fields; }; struct dpaux_register { diff --git a/epan/dissectors/packet-dpauxmon.c b/epan/dissectors/packet-dpauxmon.c index f89fefd920..b2e6a6df29 100644 --- a/epan/dissectors/packet-dpauxmon.c +++ b/epan/dissectors/packet-dpauxmon.c @@ -42,7 +42,7 @@ static int hf_in0 = -1; static int hf_in1 = -1; static int hf_in2 = -1; -static const int *input_fields[] = { +static int * const input_fields[] = { &hf_hpd, &hf_in0, &hf_in1, diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 6edbc548c2..55b7eb8044 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -448,7 +448,7 @@ static gint dissect_sockaddr_in(proto_tree *tree, tvbuff_t *tvb, gint offset) static gint dissect_session_desc(proto_tree *tree, tvbuff_t *tvb, gint offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_dplay_flags_no_sess_desc_changes, &hf_dplay_flags_acqire_voice, &hf_dplay_flags_optimize_latency, @@ -493,7 +493,7 @@ static gint dissect_packed_player(proto_tree *tree, tvbuff_t *tvb, gint offset) { guint32 sn_len, ln_len, sd_len, pd_len, num_players, i; gint size; - static const int * flags[] = { + static int * const flags[] = { &hf_dplay_pp_flag_sending, &hf_dplay_pp_flag_in_group, &hf_dplay_pp_flag_nameserver, @@ -582,7 +582,7 @@ static gint dissect_dplay_super_packed_player(proto_tree *tree, tvbuff_t *tvb, g proto_item *im_item = NULL; proto_tree *im_tree = NULL; gint len; - static const int * ssp_flags[] = { + static int * const ssp_flags[] = { &hf_dplay_spp_flags_sending, &hf_dplay_spp_flags_in_group, &hf_dplay_spp_flags_nameserver, @@ -725,7 +725,7 @@ static gint dissect_type01_message(proto_tree *tree, tvbuff_t *tvb, gint offset) static gint dissect_type02_message(proto_tree *tree, tvbuff_t *tvb, gint offset) { guint32 passwd_offset; - static const int * flags[] = { + static int * const flags[] = { &hf_enum_sess_flag_passwd, &hf_enum_sess_flag_all, &hf_enum_sess_flag_join, @@ -746,7 +746,7 @@ static gint dissect_type02_message(proto_tree *tree, tvbuff_t *tvb, gint offset) static gint dissect_type05_message(proto_tree *tree, tvbuff_t *tvb, gint offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_dplay_type_05_secure, &hf_dplay_type_05_unknown, &hf_dplay_type_05_local, diff --git a/epan/dissectors/packet-dpnet.c b/epan/dissectors/packet-dpnet.c index 2477993661..57d664090c 100644 --- a/epan/dissectors/packet-dpnet.c +++ b/epan/dissectors/packet-dpnet.c @@ -221,7 +221,7 @@ static const true_false_string tfs_flags_full = { }; -static const int * desc_flags[] = { +static int * const desc_flags[] = { &hf_dpnet_desc_client_server, &hf_dpnet_desc_migrate_host, &hf_dpnet_desc_nodpnsvr, @@ -232,7 +232,7 @@ static const int * desc_flags[] = { NULL }; -static const int * command_flags[] = { +static int * const command_flags[] = { &hf_dpnet_command_data, &hf_dpnet_command_reliable, &hf_dpnet_command_seq, diff --git a/epan/dissectors/packet-drbd.c b/epan/dissectors/packet-drbd.c index eaff1e1406..0de3485e61 100644 --- a/epan/dissectors/packet-drbd.c +++ b/epan/dissectors/packet-drbd.c @@ -560,7 +560,7 @@ static gint ett_drbd_uuid_flags = -1; static gint ett_drbd_history_uuids = -1; static gint ett_drbd_data_flags = -1; -static const int *state_fields[] = { +static int * const state_fields[] = { &hf_drbd_state_role, &hf_drbd_state_peer, &hf_drbd_state_conn, @@ -576,7 +576,7 @@ static const int *state_fields[] = { NULL }; -static const int *uuid_flag_fields[] = { +static int * const uuid_flag_fields[] = { &hf_drbd_uuid_flag_discard_my_data, &hf_drbd_uuid_flag_crashed_primary, &hf_drbd_uuid_flag_inconsistent, @@ -591,7 +591,7 @@ static const int *uuid_flag_fields[] = { NULL }; -static const int *data_flag_fields[] = { +static int * const data_flag_fields[] = { &hf_drbd_dp_hardbarrier, &hf_drbd_dp_rw_sync, &hf_drbd_dp_may_set_in_sync, diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index 118fbbf719..4dcf621957 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -661,7 +661,7 @@ dissect_drda_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint16 iParameterCP; gint iLengthParam; - static const int * format_flags[] = { + static int * const format_flags[] = { &hf_drda_ddm_fmt_reserved, &hf_drda_ddm_fmt_chained, &hf_drda_ddm_fmt_errcont, diff --git a/epan/dissectors/packet-dtcp-ip.c b/epan/dissectors/packet-dtcp-ip.c index 509af7d05d..3709a05972 100644 --- a/epan/dissectors/packet-dtcp-ip.c +++ b/epan/dissectors/packet-dtcp-ip.c @@ -66,7 +66,7 @@ static const value_string subfct[] = { { 0, NULL } }; -static const int *ake_procedure_fields[] = { /* must be int, not gint */ +static int * const ake_procedure_fields[] = { /* must be int, not gint */ &hf_dtcp_ip_ake_proc_full, &hf_dtcp_ip_ake_proc_ex_full, NULL diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 1ed0a191a9..6eb0c06251 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -925,7 +925,7 @@ dissect_version_5_and_6_primary_header(packet_info *pinfo, proto_item *ti_cust_scheme_offset, *ti_cust_ssp_offset; proto_item *ti_rprt_scheme_offset, *ti_rprt_ssp_offset; proto_tree *gen_flag_tree, *srr_flag_tree, *proc_flag_tree, *cos_flag_tree; - static const int * pri_flags[] = { + static int * const pri_flags[] = { &hf_bundle_procflags_fragment, &hf_bundle_procflags_admin, &hf_bundle_procflags_dont_fragment, @@ -935,7 +935,7 @@ dissect_version_5_and_6_primary_header(packet_info *pinfo, NULL }; - static const int * srr_flags[] = { + static int * const srr_flags[] = { &hf_bundle_srrflags_report_receipt, &hf_bundle_srrflags_report_cust_accept, &hf_bundle_srrflags_report_forward, @@ -1174,7 +1174,7 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int /* This is really a SDNV but there are only 7 bits defined so leave it this way*/ if (version == 4) { - static const gint *flags[] = { + static int * const flags[] = { &hf_bundle_payload_flags_replicate_hdr, &hf_bundle_payload_flags_xmit_report, &hf_bundle_payload_flags_discard_on_fail, @@ -1863,7 +1863,7 @@ display_extension_block(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int case BUNDLE_BLOCK_TYPE_EXTENDED_COS: { int flags; - static const int * ecos_flags_fields[] = { + static int * const ecos_flags_fields[] = { &hf_ecos_flags_critical, &hf_ecos_flags_streaming, &hf_ecos_flags_flowlabel, diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 993e9a8511..47fd97ef6b 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -685,7 +685,7 @@ dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ switch (message_type) { case LookupBeginRequest: { - static const int * flags[] = { + static int * const flags[] = { &hf_dtpt_flags_res_service, &hf_dtpt_flags_flushprevious, &hf_dtpt_flags_flushcache, diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c index 897cbfa331..9571e4972f 100644 --- a/epan/dissectors/packet-dvb-s2-bb.c +++ b/epan/dissectors/packet-dvb-s2-bb.c @@ -586,7 +586,7 @@ static int dissect_dvb_s2_gse(tvbuff_t *tvb, int cur_off, proto_tree *tree, pack tvbuff_t *next_tvb; - static const int * gse_header_bitfields[] = { + static int * const gse_header_bitfields[] = { &hf_dvb_s2_gse_hdr_start, &hf_dvb_s2_gse_hdr_stop, &hf_dvb_s2_gse_hdr_labeltype, @@ -751,7 +751,7 @@ static int dissect_dvb_s2_bb(tvbuff_t *tvb, int cur_off, proto_tree *tree, packe int sub_dissected = 0, flag_is_ms = 0, new_off = 0; - static const int * bb_header_bitfields[] = { + static int * const bb_header_bitfields[] = { &hf_dvb_s2_bb_matype1_gs, &hf_dvb_s2_bb_matype1_mis, &hf_dvb_s2_bb_matype1_acm, @@ -869,7 +869,7 @@ static int dissect_dvb_s2_modeadapt(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti; proto_tree *dvb_s2_modeadapt_tree; - static const int * modeadapt_acm_bitfields[] = { + static int * const modeadapt_acm_bitfields[] = { &hf_dvb_s2_modeadapt_acm_fecframe, &hf_dvb_s2_modeadapt_acm_pilot, &hf_dvb_s2_modeadapt_acm_modcod, diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index d3d4f0cae1..83a5d0336f 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -1095,7 +1095,7 @@ static int hf_dvbci_sas_sess_state = -1; static int hf_dvbci_sas_msg_nb = -1; static int hf_dvbci_sas_msg_len = -1; -static const int *dvb_ci_res_id_fields[] = { +static int * const dvb_ci_res_id_fields[] = { &hf_dvbci_res_id_type, &hf_dvbci_res_class, &hf_dvbci_res_type, @@ -1103,7 +1103,7 @@ static const int *dvb_ci_res_id_fields[] = { NULL }; -static const int *dvbci_opp_dlv_sys_hint_fields[] = { +static int * const dvbci_opp_dlv_sys_hint_fields[] = { &hf_dvbci_dlv_sys_hint_t, &hf_dvbci_dlv_sys_hint_s, &hf_dvbci_dlv_sys_hint_c, diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index 665b889edc..bddb153962 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -337,7 +337,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* PROBE and NEIGHBORS 2 packets have capabilities flags, unused for other packets */ if (code==DVMRP_V3_PROBE || code==DVMRP_V3_NEIGHBORS_2) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_cap_netmask, &hf_cap_snmp, &hf_cap_mtrace, diff --git a/epan/dissectors/packet-ebhscr.c b/epan/dissectors/packet-ebhscr.c index 1a830d5019..6d12663fb9 100644 --- a/epan/dissectors/packet-ebhscr.c +++ b/epan/dissectors/packet-ebhscr.c @@ -55,7 +55,7 @@ static gint ett_ebhscr_packet_header = -1; static gint ett_ebhscr_status = -1; static gint ett_ebhscr_mjr_hdr = -1; -static const int *eth_error_bits[] = { +static int * const eth_error_bits[] = { &hf_eth_crc_error, &hf_eth_mii_foe, &hf_eth_payload_foe, @@ -67,7 +67,7 @@ static const int *eth_error_bits[] = { NULL }; -static const int *eth_mjr_hdr_bits[] = { +static int * const eth_mjr_hdr_bits[] = { &hf_eth_link_up_down, &hf_eth_master_slave, &hf_eth_speed, diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c index d81b447bf0..094d3a8c25 100644 --- a/epan/dissectors/packet-ecmp.c +++ b/epan/dissectors/packet-ecmp.c @@ -1571,7 +1571,7 @@ static void get_object_info_response(packet_info* pinfo, int offset, tvbuff_t *t break; case 3: { - static const int * fields[] = { + static int * const fields[] = { &hf_ecmp_param_format_bit_default_unipolar, &hf_ecmp_param_format_write_allowed, &hf_ecmp_param_format_read_not_allowed, @@ -1764,7 +1764,7 @@ static void file_open(int offset, gboolean request, tvbuff_t *tvb, proto_tree* e guint8 relative = 0; if (request) { - static const int * fields[] = { + static int * const fields[] = { &hf_ecmp_open_in_non_blocking_mode, &hf_ecmp_open_file_relative_to_specified_directory_handle, &hf_ecmp_file_access_mode, @@ -1906,7 +1906,7 @@ static int get_file_attribute(packet_info* pinfo, int offset, guint8 attribute0, break; case 3: /*display attrib*/ { - static const int * fields[] = { + static int * const fields[] = { &hf_ecmp_display_attr_read_only, &hf_ecmp_display_attr_hidden, &hf_ecmp_display_attr_system, diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c index 45647d803b..41c0ad5928 100644 --- a/epan/dissectors/packet-ecp.c +++ b/epan/dissectors/packet-ecp.c @@ -192,7 +192,7 @@ dissect_vdp_tlv_assoc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, p /* Reason */ reason = tvb_get_guint8(tvb, offset); if (reason & 0x40) { - static const int * response_flags[] = { + static int * const response_flags[] = { &hf_vdp_tlv_assoc_flag_hard_error, &hf_vdp_tlv_assoc_flag_keep, &hf_vdp_tlv_assoc_flag_req_rsp, @@ -202,7 +202,7 @@ dissect_vdp_tlv_assoc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, p proto_tree_add_item(vdp_tlv_assoc_tree, hf_vdp_tlv_assoc_error, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bitmask(vdp_tlv_assoc_tree, tvb, offset, hf_vdp_tlv_assoc_response_flags, ett_vdp_assoc_flags, response_flags, ENC_BIG_ENDIAN); } else { - static const int * request_flags[] = { + static int * const request_flags[] = { &hf_vdp_tlv_assoc_flag_mbit, &hf_vdp_tlv_assoc_flag_sbit, &hf_vdp_tlv_assoc_flag_req_rsp, diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index 278101193a..3aff03f59a 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -727,7 +727,7 @@ tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t for ( j=0; j < num_major_frames; ++j ) { proto_tree* major_tree; - const int * major_fields[] = { + static int * const major_fields[] = { /* &hf_ehs_sh_tdm_mjfs_reserved, */ &hf_ehs_sh_tdm_mjfs_parent_frame_error, &hf_ehs_sh_tdm_mjfs_checksum_error, @@ -744,7 +744,7 @@ tdm_secondary_header_dissector ( proto_tree* ehs_secondary_header_tree, tvbuff_t for ( j=0; j < num_minor_frames; ++j ) { proto_tree* minor_tree; - const int * minor_fields[] = { + static int * const minor_fields[] = { &hf_ehs_sh_tdm_mnfs_parent_frame_error, &hf_ehs_sh_tdm_mnfs_data_not_available, &hf_ehs_sh_tdm_mnfs_checksum_error, diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index dfd9ab6a01..de4ab9a318 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -333,7 +333,7 @@ static gint hf_eigrp_flags_eot = -1; static gint hf_eigrp_flags_condrecv = -1; static gint ett_eigrp_flags = -1; -static const int *eigrp_flag_fields[] = { +static int * const eigrp_flag_fields[] = { &hf_eigrp_flags_init, &hf_eigrp_flags_condrecv, &hf_eigrp_flags_restart, @@ -387,7 +387,7 @@ static gint hf_eigrp_stub_flags_redist = -1; static gint hf_eigrp_stub_flags_leakmap = -1; static gint ett_eigrp_stub_flags = -1; -static const int *eigrp_stub_flag_fields[] = { +static int * const eigrp_stub_flag_fields[] = { &hf_eigrp_stub_flags_connected, &hf_eigrp_stub_flags_static, &hf_eigrp_stub_flags_summary, diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 241aba6e67..a7e17145d0 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -85,7 +85,7 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree *enc_tree; proto_item *ti; - static const int *flags[] = { + static int * const flags[] = { &hf_enc_flags_payload_enc, &hf_enc_flags_payload_auth, &hf_enc_flags_payload_compress, diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 63e4deaa03..be6410cb77 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1392,7 +1392,7 @@ dissect_tcpip_status(packet_info *pinfo, proto_tree *tree, proto_item *item, tvb int offset, int total_len) { - static const int * status[] = { + static int * const status[] = { &hf_tcpip_status_interface_config, &hf_tcpip_status_mcast_pending, &hf_tcpip_status_interface_config_pending, @@ -1419,7 +1419,7 @@ dissect_tcpip_config_cap(packet_info *pinfo, proto_tree *tree, proto_item *item, int offset, int total_len) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_tcpip_config_cap_bootp, &hf_tcpip_config_cap_dns, &hf_tcpip_config_cap_dhcp, @@ -1447,7 +1447,7 @@ dissect_tcpip_config_control(packet_info *pinfo, proto_tree *tree, proto_item *i int offset, int total_len) { - static const int * control_bits[] = { + static int * const control_bits[] = { &hf_tcpip_config_control_config, &hf_tcpip_config_control_dns, &hf_tcpip_config_control_reserved, @@ -1582,7 +1582,7 @@ dissect_elink_interface_flags(packet_info *pinfo, proto_tree *tree, proto_item * int offset, int total_len) { - static const int * flags[] = { + static int * const flags[] = { &hf_elink_iflags_link_status, &hf_elink_iflags_duplex, &hf_elink_iflags_neg_status, @@ -1673,7 +1673,7 @@ static int dissect_elink_interface_capability(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb, int offset, int total_len _U_) { - static const int * bits[] = { + static int * const bits[] = { &hf_elink_icapability_capability_bits_manual, &hf_elink_icapability_capability_bits_auto_neg, &hf_elink_icapability_capability_bits_auto_mdix, @@ -1735,7 +1735,7 @@ dissect_elink_interface_control(packet_info *pinfo, proto_tree *tree, proto_item int offset, int total_len) { - static const int * control_bits[] = { + static int * const control_bits[] = { &hf_elink_icontrol_control_bits_auto_neg, &hf_elink_icontrol_control_bits_forced_duplex, &hf_elink_icontrol_control_bits_reserved, @@ -1848,7 +1848,7 @@ dissect_dlr_capability_flags(packet_info *pinfo, proto_tree *tree, proto_item *i int offset, int total_len) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_dlr_capflags_announce_base_node, &hf_dlr_capflags_beacon_base_node, &hf_dlr_capflags_reserved1, @@ -1909,7 +1909,7 @@ dissect_eip_security_cap(packet_info *pinfo, proto_tree *tree, proto_item *item, int offset, int total_len) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_eip_security_capflags_secure_renegotiation, &hf_eip_security_capflags_reserved, NULL @@ -2090,7 +2090,7 @@ static int dissect_eip_cert_cap_flags(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset, int total_len) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_eip_cert_capflags_push, &hf_eip_cert_capflags_reserved, NULL @@ -2388,7 +2388,7 @@ static void dissect_item_list_identity(packet_info* pinfo, tvbuff_t* tvb, int of // offset - Starts at the "Security Profiles" field. static void dissect_item_cip_security_information(tvbuff_t* tvb, int offset, proto_tree* item_tree) { - static const int * security_profiles[] = { + static int * const security_profiles[] = { &hf_enip_security_profiles_eip_integrity, &hf_enip_security_profiles_eip_confidentiality, &hf_enip_security_profiles_cip_authorization, @@ -2396,7 +2396,7 @@ static void dissect_item_cip_security_information(tvbuff_t* tvb, int offset, pro &hf_enip_security_profiles_reserved, NULL }; - static const int * iana_flags[] = { + static int * const iana_flags[] = { &hf_enip_iana_port_state_flags_tcp_44818, &hf_enip_iana_port_state_flags_udp_44818, &hf_enip_iana_port_state_flags_udp_2222, @@ -2426,7 +2426,7 @@ static void dissect_item_list_services_response(packet_info* pinfo, tvbuff_t* tv proto_tree_add_item(item_tree, hf_enip_encapver, tvb, offset, 2, ENC_LITTLE_ENDIAN); /* Capability flags */ - static const int* capability_bits[] = { + static int* const capability_bits[] = { &hf_enip_lsr_tcp, &hf_enip_lsr_udp, NULL @@ -3289,7 +3289,7 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) else if ( dlr_frametype == DLR_FT_LINK_STAT ) { /* Link_Status/Neighbor_Status */ - static const int* bits[] = { + static int* const bits[] = { &hf_dlr_lnknbrstatus_port1, &hf_dlr_lnknbrstatus_port2, &hf_dlr_lnknbrstatus_reserved, diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index ce2d1c2ba8..82518ddba3 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -2747,7 +2747,7 @@ static gint dissect_epl_soc(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gint offset) { guint8 flags; - static const int * soc_flags[] = { + static int * const soc_flags[] = { &hf_epl_soc_mc, &hf_epl_soc_ps, NULL @@ -2783,7 +2783,7 @@ dissect_epl_preq(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *tvb, p guint16 len; guint8 pdoversion; guint8 flags; - static const int * req_flags[] = { + static int * const req_flags[] = { &hf_epl_preq_ms, &hf_epl_preq_ea, &hf_epl_preq_rd, @@ -2821,7 +2821,7 @@ dissect_epl_pres(struct epl_convo *convo, proto_tree *epl_tree, tvbuff_t *tvb, p guint16 len; guint8 pdoversion; guint8 state, flags, flags2; - static const int * res_flags[] = { + static int * const res_flags[] = { &hf_epl_pres_ms, &hf_epl_pres_en, &hf_epl_pres_rd, @@ -3152,7 +3152,7 @@ dissect_epl_asnd_nmtdna(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint32 lease_time; guint32 lease_time_s; nstime_t us; - static const int * dna_flags[] = { + static int * const dna_flags[] = { &hf_epl_asnd_nmtcommand_nmtdna_ltv, &hf_epl_asnd_nmtcommand_nmtdna_hpm, &hf_epl_asnd_nmtcommand_nmtdna_nnn, diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index f8dd3dbb00..29a92d54e2 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1752,7 +1752,7 @@ dissect_host_id_ex_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i static void dissect_anchor_id_ex_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int idx) { - static const int *anchor_flags[] = + static int * const anchor_flags[] = { &hf_erf_ehdr_anchor_id_definition, &hf_erf_ehdr_anchor_id_reserved, @@ -2413,12 +2413,11 @@ static proto_item* dissect_meta_tag_bitfield(proto_item *section_tree, tvbuff_t *tvb, int offset, erf_meta_tag_info_t *tag_info, proto_item **out_tag_tree) { proto_item *tag_pi = NULL; - const int* hf_flags[ERF_HF_VALUES_PER_TAG]; + int* hf_flags[ERF_HF_VALUES_PER_TAG]; int i; DISSECTOR_ASSERT(tag_info->extra); - /* This is allowed as the array itself is not constant (not const int* const) */ for (i = 0; tag_info->extra->hf_values[i] != -1; i++) { hf_flags[i] = &tag_info->extra->hf_values[i]; } diff --git a/epan/dissectors/packet-etag.c b/epan/dissectors/packet-etag.c index 14e8bd0d3b..2c44e5408a 100644 --- a/epan/dissectors/packet-etag.c +++ b/epan/dissectors/packet-etag.c @@ -108,14 +108,14 @@ dissect_etag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint64 tci; /* Decoding per IEEE802.1BR-2012 */ - static const int * fields1[] = { + static int * const fields1[] = { &hf_etag_pcp, &hf_etag_dei, &hf_etag_iecid_base, NULL }; - static const int * fields2[] = { + static int * const fields2[] = { &hf_etag_res, &hf_etag_grp, &hf_etag_ecid_base, diff --git a/epan/dissectors/packet-evs.c b/epan/dissectors/packet-evs.c index 3226729078..134f48b6a5 100644 --- a/epan/dissectors/packet-evs.c +++ b/epan/dissectors/packet-evs.c @@ -402,7 +402,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int switch (t_bits) { case 0: { - static const int * flags_t0[] = { + static int * const flags_t0[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t0_d, @@ -416,7 +416,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 1: { - static const int * flags_t1[] = { + static int * const flags_t1[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t1_d, @@ -430,7 +430,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 2: { - static const int * flags_t2[] = { + static int * const flags_t2[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t2_d, @@ -444,7 +444,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 3: { - static const int * flags_t3[] = { + static int * const flags_t3[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t3_d, @@ -458,7 +458,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 4: { - static const int * flags_t4[] = { + static int * const flags_t4[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t4_d, @@ -472,7 +472,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 5: { - static const int * flags_t5[] = { + static int * const flags_t5[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t5_d, @@ -486,7 +486,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 6: { - static const int * flags_t6[] = { + static int * const flags_t6[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t6_d, @@ -500,7 +500,7 @@ dissect_evs_cmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *evs_tree, int break; case 7: { - static const int * flags_t7[] = { + static int * const flags_t7[] = { &hf_evs_h_bit, &hf_evs_cmr_t, &hf_evs_cmr_t7_d, @@ -695,7 +695,7 @@ dissect_evs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) num_toc); if (evs_mode_b == 0) { - static const int * flags_toc_mode_0[] = { + static int * const flags_toc_mode_0[] = { &hf_evs_h_bit, &hf_evs_f_bit, &hf_evs_mode_bit, @@ -707,7 +707,7 @@ dissect_evs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) proto_tree_add_bitmask_list(sub_tree, tvb, offset, 1, flags_toc_mode_0, ENC_BIG_ENDIAN); str = val_to_str_const((oct & 0x0f), evs_bit_rate_mode_0_values, "Unknown value"); } else { - static const int * flags_toc_mode_1[] = { + static int * const flags_toc_mode_1[] = { &hf_evs_h_bit, &hf_evs_f_bit, &hf_evs_mode_bit, diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 8067b3fc97..3e24e70e1e 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -357,7 +357,7 @@ static const value_string f5_flags_hwaction_vs[] = { {0, NULL} }; -static const int *hf_flags__fields[] = { +static int * const hf_flags__fields[] = { &hf_flags_ingress, &hf_flags_hwaction, NULL, diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index c730043d58..88698845f1 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -625,7 +625,7 @@ dissect_fc_vft(proto_tree *parent_tree, static void dissect_fc_fctl(packet_info *pinfo _U_, proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_fc_fctl_exchange_responder, &hf_fc_fctl_seq_recipient, &hf_fc_fctl_exchange_first, diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index ea95ae3bcf..1e0b183d9a 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -571,7 +571,7 @@ fcdns_hash (gconstpointer v) static void dissect_cos_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, const header_field_info *hfinfo) { - static const int * flags[] = { + static int * const flags[] = { &hfi_fcdns_cos_f.id, &hfi_fcdns_cos_1.id, &hfi_fcdns_cos_2.id, @@ -594,7 +594,7 @@ static void dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset) { guint8 type; - static const int * flags[] = { + static int * const flags[] = { &hfi_fcdns_fc4features_i.id, &hfi_fcdns_fc4features_t.id, NULL @@ -617,7 +617,7 @@ dissect_fc4features_and_type (proto_tree *parent_tree, tvbuff_t *tvb, int offset static void dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hfi_fcdns_fc4features_i.id, &hfi_fcdns_fc4features_t.id, NULL diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 98f3e98527..b5805cc2b1 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -257,7 +257,7 @@ static expert_field ei_fcels_dst_unknown = EI_INIT; static expert_field ei_fcels_no_record_of_els_req = EI_INIT; static expert_field ei_fcels_no_record_of_exchange = EI_INIT; -static const int *hf_fcels_estat_fields[] = { +static int * const hf_fcels_estat_fields[] = { &hf_fcels_estat_resp, &hf_fcels_estat_seq_init, &hf_fcels_estat_compl, @@ -654,7 +654,7 @@ static const true_false_string tfs_fc_fcels_cmn_payload = { static void dissect_cmnsvc (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - static const int * common_flags[] = { + static int * const common_flags[] = { &hf_fcels_cmn_cios, &hf_fcels_cmn_rro, &hf_fcels_cmn_vvv, @@ -668,7 +668,7 @@ dissect_cmnsvc (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flag NULL }; - static const int * pflags[] = { + static int * const pflags[] = { &hf_fcels_cmn_cios, &hf_fcels_cmn_rro, &hf_fcels_cmn_vvv, @@ -709,13 +709,13 @@ static const true_false_string tfs_fc_fcels_cls_nzctl = { static void dissect_clssvc_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - static const int * common_flags[] = { + static int * const common_flags[] = { &hf_fcels_cls_cns, &hf_fcels_cls_prio, NULL }; - static const int * pflags[] = { + static int * const pflags[] = { &hf_fcels_cls_cns, &hf_fcels_cls_sdr, &hf_fcels_cls_prio, @@ -764,7 +764,7 @@ static const true_false_string tfs_fc_fcels_fcpflags_wrxr = { static void dissect_fcp_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 flags, guint8 isreq) { - static const int * req_flags[] = { + static int * const req_flags[] = { &hf_fcels_fcpflags_trireq, &hf_fcels_fcpflags_retry, &hf_fcels_fcpflags_ccomp, @@ -776,7 +776,7 @@ dissect_fcp_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 f NULL }; - static const int * rep_flags[] = { + static int * const rep_flags[] = { &hf_fcels_fcpflags_trirep, &hf_fcels_fcpflags_retry, &hf_fcels_fcpflags_ccomp, @@ -802,7 +802,7 @@ static void dissect_speed_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 flags, int port) { proto_item *item; - static const int * speed_flags[] = { + static int * const speed_flags[] = { &hf_fcels_speedflags_1gb, &hf_fcels_speedflags_2gb, &hf_fcels_speedflags_4gb, @@ -831,7 +831,7 @@ static const true_false_string tfs_fc_fcels_prliloflags_eip = { static void dissect_prlilo_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, int flags, guint8 opcode) { - static const int * tprlo_flags[] = { + static int * const tprlo_flags[] = { &hf_fcels_tprloflags_opav, &hf_fcels_tprloflags_rpav, &hf_fcels_tprloflags_npv, @@ -839,14 +839,14 @@ dissect_prlilo_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, int fl NULL }; - static const int * prli_flags[] = { + static int * const prli_flags[] = { &hf_fcels_prliloflags_opav, &hf_fcels_tprloflags_rpav, &hf_fcels_prliloflags_ipe, NULL }; - static const int * not_prli_flags[] = { + static int * const not_prli_flags[] = { &hf_fcels_prliloflags_opav, &hf_fcels_tprloflags_rpav, &hf_fcels_prliloflags_eip, @@ -882,7 +882,7 @@ static const true_false_string tfs_fc_fcels_initctl_ackgaa = { static void dissect_initctl_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - static const int * plogi_flags[] = { + static int * const plogi_flags[] = { &hf_fcels_initctl_initial_pa, &hf_fcels_initctl_ack0, &hf_fcels_initctl_ackgaa, @@ -890,7 +890,7 @@ dissect_initctl_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint NULL }; - static const int * not_plogi_flags[] = { + static int * const not_plogi_flags[] = { &hf_fcels_initctl_sync, NULL }; @@ -922,7 +922,7 @@ static const value_string rcptctl_category_vals[] = { static void dissect_rcptctl_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags, guint8 opcode) { - static const int * plogi_flags[] = { + static int * const plogi_flags[] = { &hf_fcels_rcptctl_ack0, &hf_fcels_rcptctl_interlock, &hf_fcels_rcptctl_policy, @@ -931,7 +931,7 @@ dissect_rcptctl_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint NULL }; - static const int * not_plogi_flags[] = { + static int * const not_plogi_flags[] = { &hf_fcels_rcptctl_sync, NULL }; diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index 8a641e5524..5d6071bdee 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -185,7 +185,7 @@ dissect_fcfzs_zoneset(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int o static void dissect_fcfzs_gzc(tvbuff_t *tvb, int offset, proto_tree *parent_tree, gboolean isreq) { - static const int * flags[] = { + static int * const flags[] = { &hf_fcfzs_gzc_flags_hard_zones, &hf_fcfzs_gzc_flags_soft_zones, &hf_fcfzs_gzc_flags_zoneset_db, @@ -204,7 +204,7 @@ static void dissect_fcfzs_gest(tvbuff_t *tvb, proto_tree *parent_tree, gboolean isreq) { int offset = 16; /* past the fc_ct header */ - static const int * flags[] = { + static int * const flags[] = { &hf_fcfzs_soft_zone_set_enforced, &hf_fcfzs_hard_zone_set_enforced, NULL diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 41261b3220..88b79e4104 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -166,7 +166,7 @@ static void dissect_task_mgmt_flags(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset) { proto_item *item; - static const int * mgmt_flags[] = { + static int * const mgmt_flags[] = { &hf_fcp_mgmt_flags_obsolete, &hf_fcp_mgmt_flags_clear_aca, &hf_fcp_mgmt_flags_target_reset, @@ -253,7 +253,7 @@ dissect_rsp_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { proto_item *item; guint8 flags; - static const int * resid_present_flags[] = { + static int * const resid_present_flags[] = { &hf_fcp_rsp_flags_bidi, &hf_fcp_rsp_flags_bidi_rru, &hf_fcp_rsp_flags_bidi_rro, @@ -265,7 +265,7 @@ dissect_rsp_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) NULL }; - static const int * no_resid_flags[] = { + static int * const no_resid_flags[] = { &hf_fcp_rsp_flags_bidi, &hf_fcp_rsp_flags_conf_req, &hf_fcp_rsp_flags_resid_under, diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 7a0b261a86..48ac4a8c8c 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -234,7 +234,7 @@ static const value_string fc_sbccs_dib_lrj_errcode_val[] = { static void dissect_iui_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - static const int * iui_flags[] = { + static int * const iui_flags[] = { &hf_sbccs_iui_as, &hf_sbccs_iui_es, &hf_sbccs_iui_val, @@ -248,7 +248,7 @@ dissect_iui_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 f static void dissect_linkctlinfo (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - static const int * linkctlinfo_flags[] = { + static int * const linkctlinfo_flags[] = { &hf_sbccs_dib_linkctlinfo_ctcconn, &hf_sbccs_dib_linkctlinfo_ecrcg, NULL @@ -262,7 +262,7 @@ dissect_linkctlinfo (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 static void dissect_dh_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - static const int * dh_flags[] = { + static int * const dh_flags[] = { &hf_sbccs_dhflags_end, &hf_sbccs_dhflags_chaining, &hf_sbccs_dhflags_earlyend, @@ -278,7 +278,7 @@ dissect_dh_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 fl static void dissect_ccw_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - static const int * ccw_flags[] = { + static int * const ccw_flags[] = { &hf_sbccs_dib_ccw_flags_cd, &hf_sbccs_dib_ccw_flags_cc, &hf_sbccs_dib_ccw_flags_sli, @@ -294,7 +294,7 @@ dissect_ccw_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 fl static void dissect_cmd_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - static const int * cmd_flags[] = { + static int * const cmd_flags[] = { &hf_sbccs_dib_cmdflags_du, &hf_sbccs_dib_cmdflags_coc, &hf_sbccs_dib_cmdflags_syr, @@ -318,7 +318,7 @@ static const value_string status_ffc_val[] = { static void dissect_status_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_sbccs_dib_statusflags_ffc, &hf_sbccs_dib_statusflags_ci, &hf_sbccs_dib_statusflags_cr, @@ -335,7 +335,7 @@ dissect_status_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 static void dissect_status (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 flags) { - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_sbccs_dib_status_attention, &hf_sbccs_dib_status_modifier, &hf_sbccs_dib_status_cue, @@ -385,7 +385,7 @@ dissect_status (packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int static void dissect_sel_rst_param (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint32 flags) { - static const int * rst_param_flags[] = { + static int * const rst_param_flags[] = { &hf_sbccs_dib_ctlparam_rc, &hf_sbccs_dib_ctlparam_ru, &hf_sbccs_dib_ctlparam_ro, diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index 8929399310..7901df8714 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -82,12 +82,12 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint16 length; proto_tree *tlv_tree; int real_length; - static const int * flags[] = { + static int * const flags[] = { &hf_fefd_flags_rt, &hf_fefd_flags_rsy, NULL }; - static const int * headers[] = { + static int * const headers[] = { &hf_fefd_version, &hf_fefd_opcode, NULL diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 6cb769511d..42cc731ada 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -2232,7 +2232,7 @@ dissect_ff_msg_sm_find_tag_reply_req_dup_detection_state(tvbuff_t *tvb, * Bit 1: 1 = Duplicate Device Index Detected * 0 = Duplicate Device Index Not Detected */ - static const int * dup_flags[] = { + static int * const dup_flags[] = { &hf_ff_sm_find_tag_reply_dup_reserved, &hf_ff_sm_find_tag_reply_dup_pd_tag, &hf_ff_sm_find_tag_reply_dup_device, @@ -2501,7 +2501,7 @@ dissect_ff_msg_sm_id_rsp_smk_state(tvbuff_t *tvb, * 0 = Not Synchronized with SNTP Time Server * 1 = Synchronized with SNTP Time Server */ - static const int * state_flags[] = { + static int * const state_flags[] = { &hf_ff_sm_id_rsp_smk_state_name, &hf_ff_sm_id_rsp_smk_state_sync, NULL @@ -2531,7 +2531,7 @@ dissect_ff_msg_sm_id_rsp_dev_type(tvbuff_t *tvb, * 6 = Type D-3 and Type D-1 Device * 7 = Type D-3 and D-2 and Type D-1 Device */ - static const int * device_flags[] = { + static int * const device_flags[] = { &hf_ff_sm_id_rsp_dev_type_link, &hf_ff_sm_id_rsp_dev_type_iogateway, &hf_ff_sm_id_rsp_dev_type_hse, @@ -2561,7 +2561,7 @@ dissect_ff_msg_sm_id_rsp_dev_redundancy_state(tvbuff_t *tvb, * 1 = Type D-2 Device * 2 = Type D-3 Device */ - static const int * state_flags[] = { + static int * const state_flags[] = { &hf_ff_sm_id_rsp_dev_redundancy_state_reserved, &hf_ff_sm_id_rsp_dev_redundancy_state_role, &hf_ff_sm_id_rsp_dev_redundancy_state_type, @@ -2584,7 +2584,7 @@ dissect_ff_msg_sm_id_rsp_dup_detection_state(tvbuff_t *tvb, * Bit 1: 1 = Duplicate Device Index Detected * 0 = Duplicate Device Index Not Detected */ - static const int * dup_flags[] = { + static int * const dup_flags[] = { &hf_ff_sm_id_rsp_dup_detection_state_reserved, &hf_ff_sm_id_rsp_dup_detection_state_pd_tag, &hf_ff_sm_id_rsp_dup_detection_state_device, @@ -2901,7 +2901,7 @@ dissect_ff_msg_sm_set_assign_info_req_dev_redundancy_state(tvbuff_t *tvb, * 1 = Type D-2 Device * 2 = Type D-3 Device */ - static const int * state_flags[] = { + static int * const state_flags[] = { &hf_ff_sm_set_assign_info_req_dev_redundancy_state_reserved, &hf_ff_sm_set_assign_info_req_dev_redundancy_state_role, &hf_ff_sm_set_assign_info_req_dev_redundancy_state_type, @@ -2924,7 +2924,7 @@ dissect_ff_msg_sm_set_assign_info_req_clear_dup_detection_state(tvbuff_t *tvb, * Bit 1: 1 = Do not clear Duplicate Device Index Detected * 0 = Clear Duplicate Device Index Detected */ - static const int * state_flags[] = { + static int * const state_flags[] = { &hf_ff_sm_set_assign_info_req_clear_dup_detection_state_reserved, &hf_ff_sm_set_assign_info_req_clear_dup_detection_state_pd_tag, &hf_ff_sm_set_assign_info_req_clear_dup_detection_state_device_index, @@ -3336,7 +3336,7 @@ dissect_ff_msg_sm_dev_annunc_req_smk_state(tvbuff_t *tvb, * 0 = Not Synchronized with SNTP Time Server * 1 = Synchronized with SNTP Time Server */ - static const int * state_flags[] = { + static int * const state_flags[] = { &hf_ff_sm_dev_annunc_req_smk_state_name, &hf_ff_sm_dev_annunc_req_smk_state_sync, NULL @@ -3367,7 +3367,7 @@ dissect_ff_msg_sm_dev_annunc_req_dev_type(tvbuff_t *tvb, * 6 = Type D-3 and Type D-1 Device * 7 = Type D-3 and D-2 and Type D-1 Device */ - static const int * device_flags[] = { + static int * const device_flags[] = { &hf_ff_sm_dev_annunc_req_dev_type_link, &hf_ff_sm_dev_annunc_req_dev_type_iogateway, &hf_ff_sm_dev_annunc_req_dev_type_hse, @@ -3397,7 +3397,7 @@ dissect_ff_msg_sm_dev_annunc_req_dev_redundancy_state(tvbuff_t *tvb, * 1 = Type D-2 Device * 2 = Type D-3 Device */ - static const int * device_flags[] = { + static int * const device_flags[] = { &hf_ff_sm_dev_annunc_req_dev_redundancy_state_reserved, &hf_ff_sm_dev_annunc_req_dev_redundancy_state_role, &hf_ff_sm_dev_annunc_req_dev_redundancy_state_type, @@ -3420,7 +3420,7 @@ dissect_ff_msg_sm_dev_annunc_req_dup_detection_state(tvbuff_t *tvb, * Bit 1: 1 = Duplicate Device Index Detected * 0 = Duplicate Device Index Not Detected */ - static const int * state_flags[] = { + static int * const state_flags[] = { &hf_ff_sm_dev_annunc_req_dup_detection_state_reserved, &hf_ff_sm_dev_annunc_req_dup_detection_state_pd_tag, &hf_ff_sm_dev_annunc_req_dup_detection_state_device, @@ -7776,7 +7776,7 @@ dissect_ff_msg_lr_get_info_rsp_lr_flags(tvbuff_t *tvb, * 0 = False Transmit on both interfaces * 1 = True Transmit on one interface */ - static const int * lan_flags[] = { + static int * const lan_flags[] = { &hf_ff_lr_get_info_rsp_lr_flags_reserved, &hf_ff_lr_get_info_rsp_lr_flags_load_balance, &hf_ff_lr_get_info_rsp_lr_flags_diag, @@ -7966,7 +7966,7 @@ dissect_ff_msg_lr_put_info_req_lr_flags(tvbuff_t *tvb, * 0 = False Transmit on both interfaces * 1 = True Transmit on one interface */ - static const int * lan_flags[] = { + static int * const lan_flags[] = { &hf_ff_lr_put_info_req_lr_flags_reserved, &hf_ff_lr_put_info_req_lr_flags_load_balance, &hf_ff_lr_put_info_req_lr_flags_diag, @@ -8101,7 +8101,7 @@ dissect_ff_msg_lr_put_info_rsp_lr_flags(tvbuff_t *tvb, * 0 = False Transmit on both interfaces * 1 = True Transmit on one interface */ - static const int * lan_flags[] = { + static int * const lan_flags[] = { &hf_ff_lr_put_info_rsp_lr_flags_reserved, &hf_ff_lr_put_info_rsp_lr_flags_load_balance, &hf_ff_lr_put_info_rsp_lr_flags_diag, @@ -8461,7 +8461,7 @@ dissect_ff_msg_diagnostic_msg_req_dup_detection_stat(tvbuff_t *tvb, * Bit 18: 1 = Duplicate Device Index Detected * 0 = Duplicate Device Index Not Detected */ - static const int * dup_flags[] = { + static int * const dup_flags[] = { &hf_ff_lr_diagnostic_msg_req_dup_detection_state_reserved, &hf_ff_lr_diagnostic_msg_req_dup_detection_state_pd_tag, &hf_ff_lr_diagnostic_msg_req_dup_detection_state_device, @@ -10885,7 +10885,7 @@ static void dissect_ff_msg_hdr_proto_and_type(tvbuff_t *tvb, gint offset, proto_tree *tree) { - static const int * header[] = { + static int * const header[] = { &hf_ff_hdr_proto_id, &hf_ff_hdr_confirm_msg_type, NULL @@ -10904,7 +10904,7 @@ static void dissect_ff_msg_hdr_opts(tvbuff_t *tvb, gint offset, proto_tree *tree) { - static const int * options[] = { + static int * const options[] = { &hf_ff_hdr_opts_msg_num, &hf_ff_hdr_opts_invoke_id, &hf_ff_hdr_opts_timestamp, diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 91181d2c49..e8860f29e1 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -202,7 +202,7 @@ static int hf_fip_flag_sol = -1; static int hf_fip_flag_fport = -1; static int hf_fip_descriptors = -1; -static const int *hf_fip_flags_fields[] = { +static int * const hf_fip_flags_fields[] = { &hf_fip_flag_fpma, &hf_fip_flag_spma, &hf_fip_flag_rec_p2p, @@ -285,16 +285,16 @@ fip_desc_fc4f(tvbuff_t *tvb, proto_tree *tree, proto_item *item) guint mask; guint offset; - static const int *types_word0[] = { /* types 0 - 31 */ + static int * const types_word0[] = { /* types 0 - 31 */ &hf_fip_type_ip, &hf_fip_type_fcp, NULL }; - static const int *types_word1[] = { /* types 32 - 63 */ + static int * const types_word1[] = { /* types 32 - 63 */ &hf_fip_type_gs3, NULL }; - static const int *fcp_feat[] = { + static int * const fcp_feat[] = { &hf_fip_fcp_feat_t, &hf_fip_fcp_feat_i, NULL diff --git a/epan/dissectors/packet-flexray.c b/epan/dissectors/packet-flexray.c index ed5ca7e999..bc2810872e 100644 --- a/epan/dissectors/packet-flexray.c +++ b/epan/dissectors/packet-flexray.c @@ -55,7 +55,7 @@ static gint ett_flexray_measurement_header = -1; static gint ett_flexray_error_flags = -1; static gint ett_flexray_frame = -1; -static const int *error_fields[] = { +static int * const error_fields[] = { &hf_flexray_fcrc_err, &hf_flexray_hcrc_err, &hf_flexray_fes_err, @@ -64,7 +64,7 @@ static const int *error_fields[] = { NULL }; -static const int *frame_fields[] = { +static int * const frame_fields[] = { &hf_flexray_ppi, &hf_flexray_sfi, &hf_flexray_stfi, diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index 612e2ec577..15a77bac8e 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -784,7 +784,7 @@ dissect_fmp_notifyProtocol(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_fmp_capabilities(tvbuff_t *tvb, int offset, proto_tree *tree) { - static const int *capabilities[] = { + static int * const capabilities[] = { &hf_fmp_cap_revoke_handle_list, &hf_fmp_cap_unc_names, &hf_fmp_cap_cifsv2, diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 20f2c363e4..b4ed470202 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -419,10 +419,10 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "Bogus 1-octet address field"); offset++; } else { - static const int *first_address_bits[] = {&hf_fr_upper_dlci, &hf_fr_cr, &hf_fr_ea, NULL}; - static const int *second_address_bits[] = {&hf_fr_second_dlci, &hf_fr_fecn, + static int * const first_address_bits[] = {&hf_fr_upper_dlci, &hf_fr_cr, &hf_fr_ea, NULL}; + static int * const second_address_bits[] = {&hf_fr_second_dlci, &hf_fr_fecn, &hf_fr_becn, &hf_fr_de, &hf_fr_ea, NULL}; - static const int *third_address_bits[] = {&hf_fr_third_dlci, &hf_fr_ea, NULL}; + static int * const third_address_bits[] = {&hf_fr_third_dlci, &hf_fr_ea, NULL}; /* * The first octet contains the upper 6 bits of the DLCI, as well diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 7fdd8924a6..90600d9363 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -450,7 +450,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* if (pinfo->rec->presence_flags & WTAP_HAS_PACK_FLAGS) { proto_tree *flags_tree; proto_item *flags_item; - static const int * flags[] = { + static int * const flags[] = { &hf_frame_pack_direction, &hf_frame_pack_reception_type, &hf_frame_pack_fcs_length, diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 999dedbc8c..57de297de3 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -650,7 +650,7 @@ static expert_field ei_ftam_zero_pdu = EI_INIT; /*--- Included file: packet-ftam-fn.c ---*/ #line 1 "./asn1/ftam/packet-ftam-fn.c" -static const int * Protocol_Version_U_bits[] = { +static int * const Protocol_Version_U_bits[] = { &hf_ftam_Protocol_Version_U_version_1, &hf_ftam_Protocol_Version_U_version_2, NULL @@ -706,7 +706,7 @@ dissect_ftam_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * Service_Class_U_bits[] = { +static int * const Service_Class_U_bits[] = { &hf_ftam_Service_Class_U_unconstrained_class, &hf_ftam_Service_Class_U_management_class, &hf_ftam_Service_Class_U_transfer_class, @@ -735,7 +735,7 @@ dissect_ftam_Service_Class(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * Functional_Units_U_bits[] = { +static int * const Functional_Units_U_bits[] = { &hf_ftam_Functional_Units_U_spare_bit0, &hf_ftam_Functional_Units_U_spare_bit1, &hf_ftam_Functional_Units_U_read, @@ -776,7 +776,7 @@ dissect_ftam_Functional_Units(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * Attribute_Groups_U_bits[] = { +static int * const Attribute_Groups_U_bits[] = { &hf_ftam_Attribute_Groups_U_storage, &hf_ftam_Attribute_Groups_U_security, &hf_ftam_Attribute_Groups_U_private, @@ -1378,7 +1378,7 @@ dissect_ftam_Select_Attributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * Access_Request_U_bits[] = { +static int * const Access_Request_U_bits[] = { &hf_ftam_Access_Request_U_read, &hf_ftam_Access_Request_U_insert, &hf_ftam_Access_Request_U_replace, @@ -1666,7 +1666,7 @@ dissect_ftam_Object_Type_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * Permitted_Actions_Attribute_bits[] = { +static int * const Permitted_Actions_Attribute_bits[] = { &hf_ftam_Permitted_Actions_Attribute_read, &hf_ftam_Permitted_Actions_Attribute_insert, &hf_ftam_Permitted_Actions_Attribute_replace, @@ -1860,7 +1860,7 @@ dissect_ftam_Object_Size_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * Concurrency_Key_bits[] = { +static int * const Concurrency_Key_bits[] = { &hf_ftam_Concurrency_Key_not_required, &hf_ftam_Concurrency_Key_shared, &hf_ftam_Concurrency_Key_exclusive, @@ -2240,7 +2240,7 @@ dissect_ftam_F_DELETE_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * Attribute_Names_bits[] = { +static int * const Attribute_Names_bits[] = { &hf_ftam_Attribute_Names_read_pathname, &hf_ftam_Attribute_Names_read_permitted_actions, &hf_ftam_Attribute_Names_read_contents_type, @@ -2571,7 +2571,7 @@ dissect_ftam_F_CHANGE_ATTRIB_response(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * T_processing_mode_bits[] = { +static int * const T_processing_mode_bits[] = { &hf_ftam_T_processing_mode_f_read, &hf_ftam_T_processing_mode_f_insert, &hf_ftam_T_processing_mode_f_replace, @@ -3498,7 +3498,7 @@ dissect_ftam_F_CHANGE_PREFIX_response(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * Equality_Comparision_bits[] = { +static int * const Equality_Comparision_bits[] = { &hf_ftam_Equality_Comparision_no_value_available_matches, &hf_ftam_Equality_Comparision_equals_matches, NULL @@ -3616,7 +3616,7 @@ dissect_ftam_Pathname_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * Relational_Comparision_bits[] = { +static int * const Relational_Comparision_bits[] = { &hf_ftam_Relational_Comparision_no_value_available_matches, &hf_ftam_Relational_Comparision_equals_matches, &hf_ftam_Relational_Comparision_less_than_matches, diff --git a/epan/dissectors/packet-ftdi-ft.c b/epan/dissectors/packet-ftdi-ft.c index 797b55d671..58e3da422c 100644 --- a/epan/dissectors/packet-ftdi-ft.c +++ b/epan/dissectors/packet-ftdi-ft.c @@ -333,12 +333,12 @@ dissect_request_reset(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, proto_ static gint dissect_request_modem_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, proto_tree *tree) { - static const int *lvalue_bits[] = { + static int * const lvalue_bits[] = { &hf_setup_lvalue_dtr, &hf_setup_lvalue_rts, NULL }; - static const int *hvalue_bits[] = { + static int * const hvalue_bits[] = { &hf_setup_hvalue_dtr, &hf_setup_hvalue_rts, NULL @@ -365,7 +365,7 @@ dissect_request_modem_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, p static gint dissect_request_set_flow_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, proto_tree *tree) { - static const int *hindex_bits[] = { + static int * const hindex_bits[] = { &hf_setup_hindex_rts_cts, &hf_setup_hindex_dtr_dsr, &hf_setup_hindex_xon_xoff, @@ -392,15 +392,15 @@ dissect_request_set_flow_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset static gint dissect_request_set_baud_rate(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *tree, FTDI_CHIP chip) { - static const int *lindex_bits[] = { + static int * const lindex_bits[] = { &hf_setup_lindex_baud_high, NULL }; - static const int *hindex_bits[] = { + static int * const hindex_bits[] = { &hf_setup_hindex_baud_high, NULL }; - static const int *hindex_bits_hispeed[] = { + static int * const hindex_bits_hispeed[] = { &hf_setup_hindex_baud_high, &hf_setup_hindex_baud_clock_divide, NULL @@ -463,7 +463,7 @@ dissect_request_set_baud_rate(tvbuff_t *tvb, packet_info *pinfo, gint offset, pr static gint dissect_request_set_data(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, proto_tree *tree) { - static const int *hvalue_bits[] = { + static int * const hvalue_bits[] = { &hf_setup_hvalue_parity, &hf_setup_hvalue_stop_bits, &hf_setup_hvalue_break_bit, @@ -622,7 +622,7 @@ dissect_request_set_bitmode(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, static gint dissect_modem_status_bytes(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, proto_tree *tree, gint *out_rx_len) { - static const int *modem_status_bits[] = { + static int * const modem_status_bits[] = { &hf_modem_status_fs_max_packet, &hf_modem_status_hs_max_packet, &hf_modem_status_cts, @@ -631,7 +631,7 @@ dissect_modem_status_bytes(tvbuff_t *tvb, packet_info *pinfo _U_, gint offset, p &hf_modem_status_dcd, NULL }; - static const int *line_status_bits[] = { + static int * const line_status_bits[] = { &hf_line_status_receive_overflow, &hf_line_status_parity_error, &hf_line_status_framing_error, diff --git a/epan/dissectors/packet-ftdi-mpsse.c b/epan/dissectors/packet-ftdi-mpsse.c index 5e0d89d30e..c8e48b1da0 100644 --- a/epan/dissectors/packet-ftdi-mpsse.c +++ b/epan/dissectors/packet-ftdi-mpsse.c @@ -719,8 +719,8 @@ dissect_command_code(guint8 cmd, const char *cmd_str, tvbuff_t *tvb, proto_tree { proto_item *cmd_item; proto_tree *cmd_tree; - const int **cmd_bits; - static const int *data_shifting_cmd_bits[] = { + int * const *cmd_bits; + static int * const data_shifting_cmd_bits[] = { &hf_mpsse_command_b7, &hf_mpsse_command_b6, &hf_mpsse_command_b5, @@ -732,7 +732,7 @@ dissect_command_code(guint8 cmd, const char *cmd_str, tvbuff_t *tvb, proto_tree NULL }; - static const int *non_data_shifting_cmd_bits[] = { + static int * const non_data_shifting_cmd_bits[] = { &hf_mpsse_command_b7, NULL }; diff --git a/epan/dissectors/packet-gbcs.c b/epan/dissectors/packet-gbcs.c index 27d7ae9db3..0ebd70d498 100644 --- a/epan/dissectors/packet-gbcs.c +++ b/epan/dissectors/packet-gbcs.c @@ -1409,7 +1409,7 @@ dissect_gbcs_message_gbt_header(tvbuff_t *tvb, proto_tree *tree, guint *offset, proto_tree_add_item(gbt_header_tree, hf_gbcs_message_gbt_header_general_block_transfer, tvb, *offset, 1, ENC_NA); *offset += 1; - static const int* block_control[] = { + static int* const block_control[] = { &hf_gbcs_message_gbt_header_block_control_last_block, &hf_gbcs_message_gbt_header_block_control_streaming, &hf_gbcs_message_gbt_header_block_control_window, diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c index deed7f446f..9f3891a525 100644 --- a/epan/dissectors/packet-geneve.c +++ b/epan/dissectors/packet-geneve.c @@ -190,7 +190,7 @@ dissect_geneve(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ guint8 flags; guint16 proto_type; int opts_len; - static const int * flag_fields[] = { + static int * const flag_fields[] = { &hf_geneve_flag_oam, &hf_geneve_flag_critical, &hf_geneve_flag_reserved, diff --git a/epan/dissectors/packet-gfp.c b/epan/dissectors/packet-gfp.c index 78af6e70e8..c1b123043a 100644 --- a/epan/dissectors/packet-gfp.c +++ b/epan/dissectors/packet-gfp.c @@ -91,7 +91,7 @@ static const range_string gfp_pli_rvals[] = { {0, 0, NULL} }; -static const int *gfp_type_data_fields[] = { +static int * const gfp_type_data_fields[] = { &hf_gfp_pti, &hf_gfp_pfi, &hf_gfp_exi, @@ -99,7 +99,7 @@ static const int *gfp_type_data_fields[] = { NULL }; -static const int *gfp_type_management_fields[] = { +static int * const gfp_type_management_fields[] = { &hf_gfp_pti, &hf_gfp_pfi, &hf_gfp_exi, diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index b9c8b94487..b2dd3df80d 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -483,7 +483,7 @@ static expert_field ei_giop_message_size_too_big = EI_INIT; static expert_field ei_giop_invalid_v_minor = EI_INIT; -static const int *giop_message_flags[] = { +static int * const giop_message_flags[] = { &hf_giop_message_flags_ziop_enabled, &hf_giop_message_flags_ziop_supported, &hf_giop_message_flags_fragment, diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 1c9613a6aa..9e7c998475 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -238,7 +238,7 @@ static int glusterfs_rpc_dissect_mode(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offset) { - static const int *mode_bits[] = { + static int * const mode_bits[] = { &hf_glusterfs_mode_suid, &hf_glusterfs_mode_sgid, &hf_glusterfs_mode_svtx, @@ -400,7 +400,7 @@ glusterfs_rpc_dissect_flags(proto_tree *tree, tvbuff_t *tvb, int offset) proto_item *flag_tree; header_field_info *rdonly_hf, *accmode_hf; - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_glusterfs_flags_wronly, &hf_glusterfs_flags_rdwr, &hf_glusterfs_flags_creat, @@ -449,7 +449,7 @@ glusterfs_rpc_dissect_flags(proto_tree *tree, tvbuff_t *tvb, int offset) static int glusterfs_rpc_dissect_statfs(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_glusterfs_mnt_flag_rdonly, &hf_glusterfs_mnt_flag_nosuid, &hf_glusterfs_mnt_flag_nodev, @@ -1136,7 +1136,7 @@ glusterfs_gfs3_op_setattr_reply(tvbuff_t *tvb, packet_info *pinfo, static int glusterfs_rpc_dissect_setattr(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_glusterfs_setattr_set_mode, &hf_glusterfs_setattr_set_uid, &hf_glusterfs_setattr_set_gid, @@ -1593,7 +1593,7 @@ static int glusterfs_gfs3_3_op_fsync_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_glusterfs_fsync_flag_datasync, &hf_glusterfs_fsync_flag_unknown, NULL @@ -2549,7 +2549,7 @@ static int glusterfs_gfs4_0_op_fsync_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_glusterfs_fsync_flag_datasync, &hf_glusterfs_fsync_flag_unknown, NULL diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index c306468146..c504cf6f03 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -213,7 +213,7 @@ gluster_hndsk_2_get_volume_info_reply(tvbuff_t *tvb, packet_info *pinfo, static int glusterfs_rpc_dissect_upcall_flags(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hg_gluster_cbk_upcall_flag_nlink, &hg_gluster_cbk_upcall_flag_mode, &hg_gluster_cbk_upcall_flag_own, diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index 0795832384..cd09e5ad31 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -638,7 +638,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (tree) { - static const int * s_formats[] = { + static int * const s_formats[] = { &hf_llcgprs_S_fmt, &hf_llcgprs_As, &hf_llcgprs_sspare, @@ -709,7 +709,7 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (tree) { - static const int * i_formats[] = { + static int * const i_formats[] = { &hf_llcgprs_U_fmt, &hf_llcgprs_sp_bits, &hf_llcgprs_NU, diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 12610f0c67..5ce6bbea14 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -1300,7 +1300,7 @@ dissect_gprscdr_LCSQoSInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * LevelOfCAMELService_bits[] = { +static int * const LevelOfCAMELService_bits[] = { &hf_gprscdr_LevelOfCAMELService_basic, &hf_gprscdr_LevelOfCAMELService_callDurationSupervision, &hf_gprscdr_LevelOfCAMELService_onlineCharging, @@ -2676,7 +2676,7 @@ dissect_gprscdr_ResultCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * ServiceConditionChangeV651_bits[] = { +static int * const ServiceConditionChangeV651_bits[] = { &hf_gprscdr_ServiceConditionChangeV651_qoSChange, &hf_gprscdr_ServiceConditionChangeV651_sGSNChange, &hf_gprscdr_ServiceConditionChangeV651_sGSNPLMNIDChange, @@ -2911,7 +2911,7 @@ dissect_gprscdr_T_userLocationInformation_03(gboolean implicit_tag _U_, tvbuff_t } -static const int * ServiceConditionChangeV750_bits[] = { +static int * const ServiceConditionChangeV750_bits[] = { &hf_gprscdr_ServiceConditionChangeV750_qoSChange, &hf_gprscdr_ServiceConditionChangeV750_sGSNChange, &hf_gprscdr_ServiceConditionChangeV750_sGSNPLMNIDChange, @@ -3471,7 +3471,7 @@ dissect_gprscdr_PresenceReportingAreaElementsList(gboolean implicit_tag _U_, tvb } -static const int * PresenceReportingAreaNode_bits[] = { +static int * const PresenceReportingAreaNode_bits[] = { &hf_gprscdr_PresenceReportingAreaNode_oCS, &hf_gprscdr_PresenceReportingAreaNode_pCRF, NULL @@ -4244,7 +4244,7 @@ dissect_gprscdr_T_userLocationInformation_07(gboolean implicit_tag _U_, tvbuff_t } -static const int * ServiceConditionChange_bits[] = { +static int * const ServiceConditionChange_bits[] = { &hf_gprscdr_ServiceConditionChange_qoSChange, &hf_gprscdr_ServiceConditionChange_sGSNChange, &hf_gprscdr_ServiceConditionChange_sGSNPLMNIDChange, diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 9126578743..82cb47fb0a 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -3266,7 +3266,7 @@ de_sup_codec_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint * * Right now we are sure that at least the first octet of the bitmap is present */ - static const int * oct1_flags[] = { + static int * const oct1_flags[] = { &hf_gsm_a_dtap_codec_tdma_efr, &hf_gsm_a_dtap_codec_umts_amr_2, &hf_gsm_a_dtap_codec_umts_amr, @@ -3286,7 +3286,7 @@ de_sup_codec_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint /* * We can proceed with the second octet of the bitmap */ - static const int * oct2_flags[] = { + static int * const oct2_flags[] = { &hf_gsm_a_dtap_codec_umts_evs, &hf_gsm_a_dtap_codec_ohr_amr_wb, &hf_gsm_a_dtap_codec_ofr_amr_wb, diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 3a3c3297b9..d4215d6b64 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -5530,7 +5530,7 @@ dissect_gsm_map_ss_SS_InvocationNotificationRes(gboolean implicit_tag _U_, tvbuf } -static const int * gsm_map_ss_ServiceIndicator_bits[] = { +static int * const gsm_map_ss_ServiceIndicator_bits[] = { &hf_gsm_map_ss_ServiceIndicator_clir_invoked, &hf_gsm_map_ss_ServiceIndicator_camel_invoked, NULL @@ -7199,7 +7199,7 @@ dissect_gsm_map_sm_AlertServiceCentreArg(gboolean implicit_tag _U_, tvbuff_t *tv } -static const int * gsm_map_sm_MW_Status_bits[] = { +static int * const gsm_map_sm_MW_Status_bits[] = { &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded, &hf_gsm_map_sm_MW_Status_mnrf_Set, &hf_gsm_map_sm_MW_Status_mcef_Set, @@ -7471,7 +7471,7 @@ dissect_gsm_map_om_TraceDepthList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_om_TraceNE_TypeList_bits[] = { +static int * const gsm_map_om_TraceNE_TypeList_bits[] = { &hf_gsm_map_om_TraceNE_TypeList_msc_s, &hf_gsm_map_om_TraceNE_TypeList_mgw, &hf_gsm_map_om_TraceNE_TypeList_sgsn, @@ -7495,7 +7495,7 @@ dissect_gsm_map_om_TraceNE_TypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * gsm_map_om_MSC_S_InterfaceList_bits[] = { +static int * const gsm_map_om_MSC_S_InterfaceList_bits[] = { &hf_gsm_map_om_MSC_S_InterfaceList_a, &hf_gsm_map_om_MSC_S_InterfaceList_iu, &hf_gsm_map_om_MSC_S_InterfaceList_mc, @@ -7519,7 +7519,7 @@ dissect_gsm_map_om_MSC_S_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb } -static const int * gsm_map_om_MGW_InterfaceList_bits[] = { +static int * const gsm_map_om_MGW_InterfaceList_bits[] = { &hf_gsm_map_om_MGW_InterfaceList_mc, &hf_gsm_map_om_MGW_InterfaceList_nb_up, &hf_gsm_map_om_MGW_InterfaceList_iu_up, @@ -7536,7 +7536,7 @@ dissect_gsm_map_om_MGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_om_SGSN_InterfaceList_bits[] = { +static int * const gsm_map_om_SGSN_InterfaceList_bits[] = { &hf_gsm_map_om_SGSN_InterfaceList_gb, &hf_gsm_map_om_SGSN_InterfaceList_iu, &hf_gsm_map_om_SGSN_InterfaceList_gn, @@ -7561,7 +7561,7 @@ dissect_gsm_map_om_SGSN_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * gsm_map_om_GGSN_InterfaceList_bits[] = { +static int * const gsm_map_om_GGSN_InterfaceList_bits[] = { &hf_gsm_map_om_GGSN_InterfaceList_gn, &hf_gsm_map_om_GGSN_InterfaceList_gi, &hf_gsm_map_om_GGSN_InterfaceList_gmb, @@ -7578,7 +7578,7 @@ dissect_gsm_map_om_GGSN_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * gsm_map_om_RNC_InterfaceList_bits[] = { +static int * const gsm_map_om_RNC_InterfaceList_bits[] = { &hf_gsm_map_om_RNC_InterfaceList_iu, &hf_gsm_map_om_RNC_InterfaceList_iur, &hf_gsm_map_om_RNC_InterfaceList_iub, @@ -7596,7 +7596,7 @@ dissect_gsm_map_om_RNC_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_om_BMSC_InterfaceList_bits[] = { +static int * const gsm_map_om_BMSC_InterfaceList_bits[] = { &hf_gsm_map_om_BMSC_InterfaceList_gmb, NULL }; @@ -7611,7 +7611,7 @@ dissect_gsm_map_om_BMSC_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * gsm_map_om_MME_InterfaceList_bits[] = { +static int * const gsm_map_om_MME_InterfaceList_bits[] = { &hf_gsm_map_om_MME_InterfaceList_s1_mme, &hf_gsm_map_om_MME_InterfaceList_s3, &hf_gsm_map_om_MME_InterfaceList_s6a, @@ -7630,7 +7630,7 @@ dissect_gsm_map_om_MME_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_om_SGW_InterfaceList_bits[] = { +static int * const gsm_map_om_SGW_InterfaceList_bits[] = { &hf_gsm_map_om_SGW_InterfaceList_s4, &hf_gsm_map_om_SGW_InterfaceList_s5, &hf_gsm_map_om_SGW_InterfaceList_s8b, @@ -7649,7 +7649,7 @@ dissect_gsm_map_om_SGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_om_PGW_InterfaceList_bits[] = { +static int * const gsm_map_om_PGW_InterfaceList_bits[] = { &hf_gsm_map_om_PGW_InterfaceList_s2a, &hf_gsm_map_om_PGW_InterfaceList_s2b, &hf_gsm_map_om_PGW_InterfaceList_s2c, @@ -7671,7 +7671,7 @@ dissect_gsm_map_om_PGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_om_ENB_InterfaceList_bits[] = { +static int * const gsm_map_om_ENB_InterfaceList_bits[] = { &hf_gsm_map_om_ENB_InterfaceList_s1_mme, &hf_gsm_map_om_ENB_InterfaceList_x2, &hf_gsm_map_om_ENB_InterfaceList_uu, @@ -7711,7 +7711,7 @@ dissect_gsm_map_om_TraceInterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } -static const int * gsm_map_om_MSC_S_EventList_bits[] = { +static int * const gsm_map_om_MSC_S_EventList_bits[] = { &hf_gsm_map_om_MSC_S_EventList_mo_mtCall, &hf_gsm_map_om_MSC_S_EventList_mo_mt_sms, &hf_gsm_map_om_MSC_S_EventList_lu_imsiAttach_imsiDetach, @@ -7730,7 +7730,7 @@ dissect_gsm_map_om_MSC_S_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_om_MGW_EventList_bits[] = { +static int * const gsm_map_om_MGW_EventList_bits[] = { &hf_gsm_map_om_MGW_EventList_context, NULL }; @@ -7745,7 +7745,7 @@ dissect_gsm_map_om_MGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const int * gsm_map_om_SGSN_EventList_bits[] = { +static int * const gsm_map_om_SGSN_EventList_bits[] = { &hf_gsm_map_om_SGSN_EventList_pdpContext, &hf_gsm_map_om_SGSN_EventList_mo_mt_sms, &hf_gsm_map_om_SGSN_EventList_rau_gprsAttach_gprsDetach, @@ -7763,7 +7763,7 @@ dissect_gsm_map_om_SGSN_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_om_GGSN_EventList_bits[] = { +static int * const gsm_map_om_GGSN_EventList_bits[] = { &hf_gsm_map_om_GGSN_EventList_pdpContext, &hf_gsm_map_om_GGSN_EventList_mbmsContext, NULL @@ -7779,7 +7779,7 @@ dissect_gsm_map_om_GGSN_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_om_BMSC_EventList_bits[] = { +static int * const gsm_map_om_BMSC_EventList_bits[] = { &hf_gsm_map_om_BMSC_EventList_mbmsMulticastServiceActivation, NULL }; @@ -7794,7 +7794,7 @@ dissect_gsm_map_om_BMSC_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_om_MME_EventList_bits[] = { +static int * const gsm_map_om_MME_EventList_bits[] = { &hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest, &hf_gsm_map_om_MME_EventList_serviceRequestts, &hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach, @@ -7814,7 +7814,7 @@ dissect_gsm_map_om_MME_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const int * gsm_map_om_SGW_EventList_bits[] = { +static int * const gsm_map_om_SGW_EventList_bits[] = { &hf_gsm_map_om_SGW_EventList_pdn_connectionCreation, &hf_gsm_map_om_SGW_EventList_pdn_connectionTermination, &hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion, @@ -7831,7 +7831,7 @@ dissect_gsm_map_om_SGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const int * gsm_map_om_PGW_EventList_bits[] = { +static int * const gsm_map_om_PGW_EventList_bits[] = { &hf_gsm_map_om_PGW_EventList_pdn_connectionCreation, &hf_gsm_map_om_PGW_EventList_pdn_connectionTermination, &hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion, @@ -8374,7 +8374,7 @@ dissect_gsm_map_om_DeactivateTraceModeRes(gboolean implicit_tag _U_, tvbuff_t *t /* --- Module MAP-MS-DataTypes --- --- --- */ -static const int * gsm_map_ms_SupportedCamelPhases_bits[] = { +static int * const gsm_map_ms_SupportedCamelPhases_bits[] = { &hf_gsm_map_ms_SupportedCamelPhases_phase1, &hf_gsm_map_ms_SupportedCamelPhases_phase2, &hf_gsm_map_ms_SupportedCamelPhases_phase3, @@ -8449,7 +8449,7 @@ dissect_gsm_map_ms_SuperChargerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * gsm_map_ms_SupportedLCS_CapabilitySets_bits[] = { +static int * const gsm_map_ms_SupportedLCS_CapabilitySets_bits[] = { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet2, &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet3, @@ -8468,7 +8468,7 @@ dissect_gsm_map_ms_SupportedLCS_CapabilitySets(gboolean implicit_tag _U_, tvbuff } -static const int * gsm_map_ms_OfferedCamel4CSIs_bits[] = { +static int * const gsm_map_ms_OfferedCamel4CSIs_bits[] = { &hf_gsm_map_ms_OfferedCamel4CSIs_o_csi, &hf_gsm_map_ms_OfferedCamel4CSIs_d_csi, &hf_gsm_map_ms_OfferedCamel4CSIs_vt_csi, @@ -8489,7 +8489,7 @@ dissect_gsm_map_ms_OfferedCamel4CSIs(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_ms_SupportedRAT_Types_bits[] = { +static int * const gsm_map_ms_SupportedRAT_Types_bits[] = { &hf_gsm_map_ms_SupportedRAT_Types_utran, &hf_gsm_map_ms_SupportedRAT_Types_geran, &hf_gsm_map_ms_SupportedRAT_Types_gan, @@ -9420,7 +9420,7 @@ dissect_gsm_map_ms_AuthenticationFailureReportRes(gboolean implicit_tag _U_, tvb } -static const int * gsm_map_ms_SupportedFeatures_bits[] = { +static int * const gsm_map_ms_SupportedFeatures_bits[] = { &hf_gsm_map_ms_SupportedFeatures_odb_all_apn, &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN, &hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN, @@ -9474,7 +9474,7 @@ dissect_gsm_map_ms_SupportedFeatures(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * gsm_map_ms_Ext_SupportedFeatures_bits[] = { +static int * const gsm_map_ms_Ext_SupportedFeatures_bits[] = { &hf_gsm_map_ms_Ext_SupportedFeatures_unlicensedSpectrumAsSecondaryRAT, NULL }; @@ -9611,7 +9611,7 @@ dissect_gsm_map_ms_PDN_GW_Update(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const int * gsm_map_ms_ISR_Information_bits[] = { +static int * const gsm_map_ms_ISR_Information_bits[] = { &hf_gsm_map_ms_ISR_Information_updateLocation, &hf_gsm_map_ms_ISR_Information_cancelSGSN, &hf_gsm_map_ms_ISR_Information_initialAttachIndicator, @@ -10200,7 +10200,7 @@ dissect_gsm_map_ms_LCLS_GlobalCallReference(gboolean implicit_tag _U_, tvbuff_t } -static const int * gsm_map_ms_LCLS_Negotiation_bits[] = { +static int * const gsm_map_ms_LCLS_Negotiation_bits[] = { &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_not_allowed_bit, &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_spare_bit, NULL @@ -10216,7 +10216,7 @@ dissect_gsm_map_ms_LCLS_Negotiation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * gsm_map_ms_LCLS_ConfigurationPreference_bits[] = { +static int * const gsm_map_ms_LCLS_ConfigurationPreference_bits[] = { &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_sending_indicator, &hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_sending_indicator, &hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_reception_indicator, @@ -10754,7 +10754,7 @@ dissect_gsm_map_ms_SendAuthenticationInfoRes(gboolean implicit_tag _U_, tvbuff_t } -static const int * gsm_map_ms_RequestedEquipmentInfo_bits[] = { +static int * const gsm_map_ms_RequestedEquipmentInfo_bits[] = { &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus, &hf_gsm_map_ms_RequestedEquipmentInfo_bmuef, NULL @@ -11200,7 +11200,7 @@ dissect_gsm_map_ms_Ext_SS_InfoList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_ms_ODB_GeneralData_bits[] = { +static int * const gsm_map_ms_ODB_GeneralData_bits[] = { &hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred, &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred, &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred, @@ -11243,7 +11243,7 @@ dissect_gsm_map_ms_ODB_GeneralData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_ms_ODB_HPLMN_Data_bits[] = { +static int * const gsm_map_ms_ODB_HPLMN_Data_bits[] = { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType1, &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType2, &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType3, @@ -11325,7 +11325,7 @@ dissect_gsm_map_ms_VBSDataList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * gsm_map_ms_AdditionalSubscriptions_bits[] = { +static int * const gsm_map_ms_AdditionalSubscriptions_bits[] = { &hf_gsm_map_ms_AdditionalSubscriptions_privilegedUplinkRequest, &hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest, &hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset, @@ -12838,7 +12838,7 @@ dissect_gsm_map_ms_SGSN_CAMEL_SubscriptionInfo(gboolean implicit_tag _U_, tvbuff } -static const int * gsm_map_ms_AccessRestrictionData_bits[] = { +static int * const gsm_map_ms_AccessRestrictionData_bits[] = { &hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed, &hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed, &hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed, @@ -13149,7 +13149,7 @@ dissect_gsm_map_ms_VPLMN_CSG_SubscriptionDataList(gboolean implicit_tag _U_, tvb } -static const int * gsm_map_ms_Ext_AccessRestrictionData_bits[] = { +static int * const gsm_map_ms_Ext_AccessRestrictionData_bits[] = { &hf_gsm_map_ms_Ext_AccessRestrictionData_nrAsSecondaryRATNotAllowed, &hf_gsm_map_ms_Ext_AccessRestrictionData_unlicensedSpectrumAsSecondaryRATNotAllowed, NULL @@ -13528,7 +13528,7 @@ dissect_gsm_map_ms_LSAInformationWithdraw(gboolean implicit_tag _U_, tvbuff_t *t } -static const int * gsm_map_ms_SpecificCSI_Withdraw_bits[] = { +static int * const gsm_map_ms_SpecificCSI_Withdraw_bits[] = { &hf_gsm_map_ms_SpecificCSI_Withdraw_o_csi, &hf_gsm_map_ms_SpecificCSI_Withdraw_ss_csi, &hf_gsm_map_ms_SpecificCSI_Withdraw_tif_csi, @@ -13637,7 +13637,7 @@ dissect_gsm_map_ms_DeleteSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t * } -static const int * gsm_map_ms_OfferedCamel4Functionalities_bits[] = { +static int * const gsm_map_ms_OfferedCamel4Functionalities_bits[] = { &hf_gsm_map_ms_OfferedCamel4Functionalities_initiateCallAttempt, &hf_gsm_map_ms_OfferedCamel4Functionalities_splitLeg, &hf_gsm_map_ms_OfferedCamel4Functionalities_moveLeg, @@ -13859,7 +13859,7 @@ dissect_gsm_map_ms_DomainType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * gsm_map_ms_RequestedNodes_bits[] = { +static int * const gsm_map_ms_RequestedNodes_bits[] = { &hf_gsm_map_ms_RequestedNodes_mme, &hf_gsm_map_ms_RequestedNodes_sgsn, NULL @@ -14744,7 +14744,7 @@ dissect_gsm_map_ms_ModificationRequestFor_IP_SM_GW_Data(gboolean implicit_tag _U } -static const int * gsm_map_ms_RequestedServingNode_bits[] = { +static int * const gsm_map_ms_RequestedServingNode_bits[] = { &hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn, NULL }; @@ -14886,7 +14886,7 @@ dissect_gsm_map_ms_AnyTimeModificationArg(gboolean implicit_tag _U_, tvbuff_t *t } -static const int * gsm_map_ms_ServingNode_bits[] = { +static int * const gsm_map_ms_ServingNode_bits[] = { &hf_gsm_map_ms_ServingNode_mme, &hf_gsm_map_ms_ServingNode_sgsn, NULL @@ -15277,7 +15277,7 @@ dissect_gsm_map_ch_CallDiversionTreatmentIndicator(gboolean implicit_tag _U_, tv } -static const int * gsm_map_ch_SuppressMTSS_bits[] = { +static int * const gsm_map_ch_SuppressMTSS_bits[] = { &hf_gsm_map_ch_SuppressMTSS_suppressCUG, &hf_gsm_map_ch_SuppressMTSS_suppressCCBS, NULL @@ -15449,7 +15449,7 @@ dissect_gsm_map_ch_CCBS_Indicators(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_map_ch_AllowedServices_bits[] = { +static int * const gsm_map_ch_AllowedServices_bits[] = { &hf_gsm_map_ch_AllowedServices_firstServiceAllowed, &hf_gsm_map_ch_AllowedServices_secondServiceAllowed, NULL @@ -16080,7 +16080,7 @@ dissect_gsm_map_lcs_LocationEstimateType(gboolean implicit_tag _U_, tvbuff_t *tv } -static const int * gsm_map_lcs_DeferredLocationEventType_bits[] = { +static int * const gsm_map_lcs_DeferredLocationEventType_bits[] = { &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable, &hf_gsm_map_lcs_DeferredLocationEventType_enteringIntoArea, &hf_gsm_map_lcs_DeferredLocationEventType_leavingFromArea, @@ -16300,7 +16300,7 @@ dissect_gsm_map_lcs_LCS_QoS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const int * gsm_map_lcs_SupportedGADShapes_bits[] = { +static int * const gsm_map_lcs_SupportedGADShapes_bits[] = { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPoint, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyCircle, &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyEllipse, @@ -19581,7 +19581,7 @@ dissect_gsm_ss_UserUserServiceArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * gsm_ss_DeferredLocationExt_bits[] = { +static int * const gsm_ss_DeferredLocationExt_bits[] = { &hf_gsm_ss_DeferredLocationExt_motionEvent, NULL }; @@ -19753,7 +19753,7 @@ dissect_gsm_ss_MultiplePositioningProtocolPDUs(gboolean implicit_tag _U_, tvbuff } -static const int * gsm_ss_Location_Info_bits[] = { +static int * const gsm_ss_Location_Info_bits[] = { &hf_gsm_ss_Location_Info_locationEstimate, NULL }; @@ -21953,7 +21953,7 @@ dissect_NokiaMAP_Extensions_AccessSubscriptionListExt(gboolean implicit_tag _U_, } -static const int * NokiaMAP_Extensions_AllowedServiceData_bits[] = { +static int * const NokiaMAP_Extensions_AllowedServiceData_bits[] = { &hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed, NULL }; diff --git a/epan/dissectors/packet-gsm_osmux.c b/epan/dissectors/packet-gsm_osmux.c index 02c8e20656..5fa033d028 100644 --- a/epan/dissectors/packet-gsm_osmux.c +++ b/epan/dissectors/packet-gsm_osmux.c @@ -260,7 +260,7 @@ static void finish_process_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr static gint dissect_osmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - static const gint *ft_ctr_fields[] = { + static int * const ft_ctr_fields[] = { &hf_osmux_rtp_m, &hf_osmux_ft, &hf_osmux_ctr, @@ -268,7 +268,7 @@ dissect_osmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U &hf_osmux_amr_q, NULL }; - static const gint *amr_ft_cmr_fields[] = { + static int * const amr_ft_cmr_fields[] = { &hf_osmux_amr_ft, &hf_osmux_amr_cmr, NULL diff --git a/epan/dissectors/packet-gsm_r_uus1.c b/epan/dissectors/packet-gsm_r_uus1.c index 70b0cc0340..707c546c40 100644 --- a/epan/dissectors/packet-gsm_r_uus1.c +++ b/epan/dissectors/packet-gsm_r_uus1.c @@ -217,7 +217,7 @@ de_gsm_r_uus1_chpc_forward(tvbuff_t *tvb, proto_tree *tree, guint32 offset) proto_tree_add_item(sub_tree, hf_gsm_r_uus1_chpc_pl_call, tvb, curr_offset, 1, ENC_NA); curr_offset += 1; - static const int * cause_flags[] = { + static int * const cause_flags[] = { &hf_gsm_r_uus1_chpc_cause_power, &hf_gsm_r_uus1_chpc_cause_radio, &hf_gsm_r_uus1_chpc_cause_reserved3, diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 917016b135..376ffeba6c 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -359,7 +359,7 @@ static dissector_handle_t sub_handle_cap; static dissector_handle_t sim_handle, sim_part_handle; -static const int *tprof_b1_fields[] = { +static int * const tprof_b1_fields[] = { &hf_tp_prof_dld, &hf_tp_sms_data_dld, &hf_tp_cb_data_dld, @@ -371,7 +371,7 @@ static const int *tprof_b1_fields[] = { NULL }; -static const int *tprof_b2_fields[] = { +static int * const tprof_b2_fields[] = { &hf_tp_cmd_res, &hf_tp_cc_sim, &hf_tp_cc_sim_support3, @@ -383,7 +383,7 @@ static const int *tprof_b2_fields[] = { NULL }; -static const int *tprof_b3_fields[] = { +static int * const tprof_b3_fields[] = { &hf_tp_pa_display_text, &hf_tp_pa_get_inkey, &hf_tp_pa_get_input, @@ -395,7 +395,7 @@ static const int *tprof_b3_fields[] = { NULL }; -static const int *tprof_b4_fields[] = { +static int * const tprof_b4_fields[] = { &hf_tp_pa_select_item, &hf_tp_pa_send_sms, &hf_tp_pa_send_ss, @@ -407,7 +407,7 @@ static const int *tprof_b4_fields[] = { NULL }; -static const int *tprof_b5_fields[] = { +static int * const tprof_b5_fields[] = { &hf_tp_pa_evt_list, &hf_tp_ev_mt_call, &hf_tp_ev_call_connected, @@ -419,7 +419,7 @@ static const int *tprof_b5_fields[] = { NULL }; -static const int *tprof_b6_fields[] = { +static int * const tprof_b6_fields[] = { &hf_tp_ev_lang_sel, &hf_tp_ev_brows_term, &hf_tp_ev_data_avail, @@ -431,7 +431,7 @@ static const int *tprof_b6_fields[] = { NULL }; -static const int *tprof_b7_fields[] = { +static int * const tprof_b7_fields[] = { &hf_tp_pa_power_on, &hf_tp_pa_power_off, &hf_tp_pa_perform_card_apdu, @@ -441,7 +441,7 @@ static const int *tprof_b7_fields[] = { NULL }; -static const int *tprof_b8_fields[] = { +static int * const tprof_b8_fields[] = { &hf_tp_pa_timer_start_stop, &hf_tp_pa_timer_get_current, &hf_tp_pa_prov_loci_date_tz, @@ -453,7 +453,7 @@ static const int *tprof_b8_fields[] = { NULL }; -static const int *tprof_b9_fields[] = { +static int * const tprof_b9_fields[] = { &hf_tp_display_text, &hf_tp_send_dtmf_cmd, &hf_tp_pa_prov_loci_nmr2, @@ -465,19 +465,19 @@ static const int *tprof_b9_fields[] = { NULL }; -static const int *tprof_b10_fields[] = { +static int * const tprof_b10_fields[] = { &hf_tp_soft_key_support_select_item, &hf_tp_soft_key_support_set_up_menu, &hf_tp_rfu2, NULL }; -static const int *tprof_b11_fields[] = { +static int * const tprof_b11_fields[] = { &hf_tp_soft_key_info_max_nb, NULL }; -static const int *tprof_b12_fields[] = { +static int * const tprof_b12_fields[] = { &hf_tp_pa_open_chan, &hf_tp_pa_close_chan, &hf_tp_pa_recv_data, @@ -489,7 +489,7 @@ static const int *tprof_b12_fields[] = { NULL }; -static const int *tprof_b13_fields[] = { +static int * const tprof_b13_fields[] = { &hf_tp_bip_csd, &hf_tp_bip_gprs, &hf_tp_bip_bluetooth, @@ -499,7 +499,7 @@ static const int *tprof_b13_fields[] = { NULL }; -static const int *tprof_b14_fields[] = { +static int * const tprof_b14_fields[] = { &hf_tp_char_height, &hf_tp_nd, &hf_tp_nk, @@ -507,13 +507,13 @@ static const int *tprof_b14_fields[] = { NULL }; -static const int *tprof_b15_fields[] = { +static int * const tprof_b15_fields[] = { &hf_tp_char_width, &hf_tp_var_fonts, NULL }; -static const int *tprof_b16_fields[] = { +static int * const tprof_b16_fields[] = { &hf_tp_display_resize, &hf_tp_text_wrapping, &hf_tp_text_scrolling, @@ -522,7 +522,7 @@ static const int *tprof_b16_fields[] = { &hf_tp_width_red_menu, NULL }; -static const int *tprof_b17_fields[] = { +static int * const tprof_b17_fields[] = { &hf_tp_bip_tcp_remote, &hf_tp_bip_udp_remote, &hf_tp_bip_tcp_server, @@ -533,7 +533,7 @@ static const int *tprof_b17_fields[] = { &hf_tp_bip_hsdpa, NULL }; -static const int *tprof_b18_fields[] = { +static int * const tprof_b18_fields[] = { &hf_tp_pa_display_text_var_time_out, &hf_tp_pa_get_inkey_help, &hf_tp_bip_usb, @@ -544,18 +544,18 @@ static const int *tprof_b18_fields[] = { &hf_tp_pa_prov_loci_search_mode_change, NULL }; -static const int *tprof_b19_fields[] = { +static int * const tprof_b19_fields[] = { &hf_tp_tia_eia_version, &hf_tp_rfu4, NULL }; -static const int *tprof_b20_fields[] = { +static int * const tprof_b20_fields[] = { &hf_tp_tia_iea_is820a_reserved, NULL }; -static const int *tprof_b21_fields[] = { +static int * const tprof_b21_fields[] = { &hf_tp_ext_launch_browser_wml, &hf_tp_ext_launch_browser_xhtml, &hf_tp_ext_launch_browser_html, @@ -564,7 +564,7 @@ static const int *tprof_b21_fields[] = { NULL }; -static const int *tprof_b22_fields[] = { +static int * const tprof_b22_fields[] = { &hf_tp_utran_ps_ext_params, &hf_tp_pa_prov_loci_batt_state, &hf_tp_pa_play_tone_melody, @@ -576,7 +576,7 @@ static const int *tprof_b22_fields[] = { NULL }; -static const int *tprof_b23_fields[] = { +static int * const tprof_b23_fields[] = { &hf_tp_pa_set_frames, &hf_tp_pa_get_frames_status, &hf_tp_mms_notif_download, @@ -588,13 +588,13 @@ static const int *tprof_b23_fields[] = { NULL }; -static const int *tprof_b24_fields[] = { +static int * const tprof_b24_fields[] = { &hf_tp_class_i_max_nb_frames, &hf_tp_rfu6, NULL }; -static const int *tprof_b25_fields[] = { +static int * const tprof_b25_fields[] = { &hf_tp_evt_browsing_status, &hf_tp_evt_mms_transfer_status, &hf_tp_evt_frame_info_changed, @@ -606,19 +606,19 @@ static const int *tprof_b25_fields[] = { NULL }; -static const int *tprof_b26_fields[] = { +static int * const tprof_b26_fields[] = { &hf_tp_evt_csg_cell_select, &hf_tp_evt_contactless_state_req, &hf_tp_rfu7, NULL }; -static const int *tprof_b27_fields[] = { +static int * const tprof_b27_fields[] = { &hf_tp_rfu8, NULL }; -static const int *tprof_b28_fields[] = { +static int * const tprof_b28_fields[] = { &hf_tp_text_align_left, &hf_tp_text_align_centre, &hf_tp_text_align_right, @@ -629,7 +629,7 @@ static const int *tprof_b28_fields[] = { NULL }; -static const int *tprof_b29_fields[] = { +static int * const tprof_b29_fields[] = { &hf_tp_text_style_normal, &hf_tp_text_style_bold, &hf_tp_text_style_italic, @@ -641,7 +641,7 @@ static const int *tprof_b29_fields[] = { NULL }; -static const int *tprof_b30_fields[] = { +static int * const tprof_b30_fields[] = { &hf_tp_bip_iwlan, &hf_tp_pa_prov_loci_wsid, &hf_tp_term_app, @@ -653,7 +653,7 @@ static const int *tprof_b30_fields[] = { NULL }; -static const int *tprof_b31_fields[] = { +static int * const tprof_b31_fields[] = { &hf_tp_pa_contactless_state_changed, &hf_tp_csg_cell_discovery, &hf_tp_cnf_params_support_open_chan_server_mode, @@ -665,7 +665,7 @@ static const int *tprof_b31_fields[] = { NULL }; -static const int *tprof_b32_fields[] = { +static int * const tprof_b32_fields[] = { &hf_tp_bip_ims, &hf_tp_pa_prov_loci_henb_ip_addr, &hf_tp_pa_prov_loci_henb_surround_macro, @@ -677,7 +677,7 @@ static const int *tprof_b32_fields[] = { NULL }; -static const int *tprof_b33_fields[] = { +static int * const tprof_b33_fields[] = { &hf_tp_support_dns_addr_req, &hf_tp_support_nw_access_name_reuse, &hf_tp_ev_poll_intv_nego, diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index e3a4d2868e..d12575b9fe 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -1505,7 +1505,7 @@ static const true_false_string tfs_status_report_active = { "A Status Report gen static void dis_iei_scp(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint32 offset, guint8 length, gsm_sms_udh_fields_t *p_udh_fields _U_) { - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_gsm_sms_status_report_short_msg, &hf_gsm_sms_status_report_permanent_error, &hf_gsm_sms_status_report_temp_error_no_attempt, @@ -1607,7 +1607,7 @@ dis_iei_tf(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint32 offset, { proto_tree* subtree_colour; - static const int * format_flags[] = { + static int * const format_flags[] = { &hf_gsm_sms_formatting_mode_alignment, &hf_gsm_sms_formatting_mode_font_size, &hf_gsm_sms_formatting_mode_style_bold, @@ -2267,7 +2267,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset static void dis_field_pi(tvbuff_t *tvb, proto_tree *tree, guint32 offset) { - static const int * pi_flags[] = { + static int * const pi_flags[] = { &hf_gsm_sms_tp_extension, &hf_gsm_sms_tp_reserved, &hf_gsm_sms_tp_udl_present, diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 22c08de497..4fec402b91 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -5200,7 +5200,7 @@ decode_qos_umts(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tr if ((type == 3) && (rel_ind == 8)) { /* Release 8 or higher P-GW QoS profile */ - static const int * arp_flags[] = { + static int * const arp_flags[] = { &hf_gtp_qos_arp_pci, &hf_gtp_qos_arp_pl, &hf_gtp_qos_arp_pvi, @@ -9274,13 +9274,13 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } if (tree) { if (gtp_prime) { - const int * gtp_prime_flags[] = { + static int * const gtp_prime_flags[] = { &hf_gtp_prime_flags_ver, &hf_gtp_flags_pt, &hf_gtp_flags_spare1, NULL }; - const int * gtp_prime_v0_flags[] = { + static int * const gtp_prime_v0_flags[] = { &hf_gtp_prime_flags_ver, &hf_gtp_flags_pt, &hf_gtp_flags_spare1, @@ -9310,7 +9310,7 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) ett_gtp_flags, gtp_prime_flags, gtp_hdr->flags, BMT_NO_APPEND); } } else { - const int * gtp_flags[] = { + static int * const gtp_flags[] = { &hf_gtp_flags_ver, &hf_gtp_flags_pt, &hf_gtp_flags_spare2, @@ -9319,7 +9319,7 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) &hf_gtp_flags_pn, NULL }; - const int * gtp_v0_flags[] = { + static int * const gtp_v0_flags[] = { &hf_gtp_flags_ver, &hf_gtp_flags_pt, &hf_gtp_flags_spare1, @@ -9552,18 +9552,18 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) * Container has a variable length and its content is * specified in 3GPP TS 38.415 [31]. */ - static const int * flags1[] = { + static int * const flags1[] = { &hf_gtp_ext_hdr_pdu_ses_cont_ppp, &hf_gtp_ext_hdr_pdu_ses_cont_rqi, &hf_gtp_ext_hdr_pdu_ses_cont_qos_flow_id, NULL }; - static const int * flags2[] = { + static int * const flags2[] = { &hf_gtp_ext_hdr_pdu_ses_cont_ppi, &hf_gtp_spare_b4b0, NULL }; - static const int * flags3[] = { + static int * const flags3[] = { &hf_gtp_spare_b7b6, &hf_gtp_ext_hdr_pdu_ses_cont_qos_flow_id, NULL diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index dfa218d74c..dbfe024859 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1707,7 +1707,7 @@ dissect_gtpv2_cause(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pro offset += 1; /* Octet 6 Spare PCE BCE CS */ - static const int* oct6_flags[] = { + static int* const oct6_flags[] = { &hf_gtpv2_spare_b7_b3, &hf_gtpv2_cause_pce, &hf_gtpv2_cause_bce, @@ -2325,7 +2325,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite { int offset = 0; - static const int* oct5_flags[] = { + static int* const oct5_flags[] = { &hf_gtpv2_daf, &hf_gtpv2_dtf, &hf_gtpv2_hi, @@ -2347,7 +2347,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite offset += 1; - static const int* oct6_flags[] = { + static int* const oct6_flags[] = { &hf_gtpv2_sqci, &hf_gtpv2_uimsi, &hf_gtpv2_cfsi, @@ -2370,7 +2370,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite return; } /* Only present in version 9 and higher */ - static const int* oct7_flags[] = { + static int* const oct7_flags[] = { &hf_gtpv2_retloc, &hf_gtpv2_pbic, &hf_gtpv2_srni, @@ -2389,7 +2389,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite if (length == 3) { return; } - static const int* oct8_flags[] = { + static int* const oct8_flags[] = { &hf_gtpv2_cprai, &hf_gtpv2_arrl, &hf_gtpv2_ppof, @@ -2409,7 +2409,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite return; } - static const int* oct9_flags[] = { + static int* const oct9_flags[] = { &hf_gtpv2_nsi, &hf_gtpv2_uasi, &hf_gtpv2_dtci, @@ -2429,7 +2429,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite return; } - static const int* oct10_flags[] = { + static int* const oct10_flags[] = { &hf_gtpv2_roaai, &hf_gtpv2_epcosi, &hf_gtpv2_cpopci, @@ -2448,7 +2448,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite return; } - static const int* oct11_flags[] = { + static int* const oct11_flags[] = { &hf_gtpv2_5gsnn26, &hf_gtpv2_reprefi, &hf_gtpv2_5gsiwk, @@ -2467,7 +2467,7 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite return; } - static const int* oct12_flags[] = { + static int* const oct12_flags[] = { &hf_gtpv2_spare_b7_b5, &hf_gtpv2_n5gnmi, &hf_gtpv2_5gcnrs, @@ -2738,7 +2738,7 @@ dissect_gtpv2_ecgi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *off guint32 octet4; guint8 spare; guint32 ECGI; - const int* ECGI_flags[] = { + static int* const ECGI_flags[] = { &hf_gtpv2_enodebid, &hf_gtpv2_cellid, NULL @@ -3015,7 +3015,7 @@ dissect_gtpv2_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite int offset = 0; guint flags; - static const int * gtpv2_uli_flags[] = { + static int * const gtpv2_uli_flags[] = { &hf_gtpv2_uli_ext_macro_enb_id_flg, &hf_gtpv2_uli_macro_enb_id_flg, &hf_gtpv2_uli_lai_flg, @@ -3526,7 +3526,7 @@ dissect_gtpv2_pdn_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot * 8.31 Trace Information */ /* List of NE Types */ -static const int* trace_ne_types_flags_oct1[] = { +static int* const trace_ne_types_flags_oct1[] = { &hf_gtpv2_tra_info_lne_sgw, &hf_gtpv2_tra_info_lne_mme, &hf_gtpv2_tra_info_lne_bm_sc, @@ -3538,7 +3538,7 @@ static const int* trace_ne_types_flags_oct1[] = { NULL }; -static const int* trace_ne_types_flags_oct2[] = { +static int* const trace_ne_types_flags_oct2[] = { &hf_gtpv2_tra_info_tra_info_ng_ran_node, &hf_gtpv2_tra_info_lne_upf, &hf_gtpv2_tra_info_lne_pcf, @@ -4472,7 +4472,7 @@ dissect_gtpv2_mm_context_utms_q(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre ear_len = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_gtpv2_mm_context_ear_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - static const int * ear_flags[] = { + static int * const ear_flags[] = { &hf_gtpv2_mm_context_nrsrna, NULL }; @@ -4687,7 +4687,7 @@ dissect_gtpv2_mm_context_eps_qq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre * spare | USSRNA | NRSRNA */ if(ex_access_res_data_len > 0){ - static const int* ear_flags[] = { + static int* const ear_flags[] = { &hf_gtpv2_spare_b7_b5, &hf_gtpv2_mm_context_nruna, &hf_gtpv2_mm_context_nrusrna, @@ -6191,7 +6191,7 @@ dissect_gtpv2_csg_info_rep_action(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t { int offset = 0; - static const int * flags[] = { + static int * const flags[] = { &hf_gtpv2_csg_info_rep_action_b2, &hf_gtpv2_csg_info_rep_action_b1, &hf_gtpv2_csg_info_rep_action_b0, @@ -6276,7 +6276,7 @@ static void dissect_gtpv2_node_features(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_, session_args_t * args _U_) { int offset = 0; - static const int * features[] = { + static int * const features[] = { &hf_gtpv2_node_features_prn, &hf_gtpv2_node_features_mabr, &hf_gtpv2_node_features_ntsr, @@ -6644,7 +6644,7 @@ dissect_gtpv2_twan_identifier(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree int offset = 0; guint8 flags=0; guint32 ssid_len, civa_len, op_name_len, relay_id_type, relay_id_len, circuit_id_id_len; - const int* twan_id_flags[] = { + static int* const twan_id_flags[] = { &hf_gtpv2_twan_laii, &hf_gtpv2_twan_opnai, &hf_gtpv2_twan_plmni, @@ -7083,7 +7083,7 @@ dissect_gtpv2_pres_rep_area_action(tvbuff_t *tvb, packet_info *pinfo, proto_tree int offset = 0; tvbuff_t * new_tvb; - static const int * flags[] = { + static int * const flags[] = { &hf_gtpv2_pres_rep_area_act_inapra, &hf_gtpv2_pres_rep_area_action, NULL @@ -7121,7 +7121,7 @@ dissect_gtpv2_pres_rep_area_information(tvbuff_t *tvb, packet_info *pinfo _U_, p offset+=3; /*Octet 8 Spare Spare Spare Spare INAPRA APRA OPRA IPRA */ - static const int * gtpv2_pres_rep_area_info_flags[] = { + static int * const gtpv2_pres_rep_area_info_flags[] = { &hf_gtpv2_pres_rep_area_info_flags_b4_b7_spare, &hf_gtpv2_pres_rep_area_info_flags_b3_inapra, &hf_gtpv2_pres_rep_area_info_flags_b2_apra, @@ -7145,7 +7145,7 @@ dissect_gtpv2_pres_rep_area_information(tvbuff_t *tvb, packet_info *pinfo _U_, p offset+=3; /*Octet a+3 Spare Spare Spare Spare Spare APRA OPRA IPRA */ - static const int * gtpv2_pres_rep_area_info_flags_no_inapra[] = { + static int * const gtpv2_pres_rep_area_info_flags_no_inapra[] = { &hf_gtpv2_pres_rep_area_info_flags_b3_b7_spare, &hf_gtpv2_pres_rep_area_info_flags_b2_apra, &hf_gtpv2_pres_rep_area_info_flags_b1_opra, @@ -7413,7 +7413,7 @@ static void dissect_gtpv2_ciot_opt_support_ind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 length, guint8 message_type _U_, guint8 instance _U_, session_args_t * args _U_) { int offset; - static const int *ciot_flags[] = { + static int * const ciot_flags[] = { &hf_gtpv2_ciot_support_ind_spare_bits, &hf_gtpv2_ciot_support_ind_bit4, &hf_gtpv2_ciot_support_ind_bit3, @@ -7458,7 +7458,7 @@ dissect_gtpv2_header_comp_comf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree { int offset = 0; - static const int * gtpv2_rohc_profile_flags_flags[] = { + static int * const gtpv2_rohc_profile_flags_flags[] = { &hf_gtpv2_rohc_profiles_bit7, &hf_gtpv2_rohc_profiles_bit6, &hf_gtpv2_rohc_profiles_bit5, @@ -7538,7 +7538,7 @@ static void dissect_gtpv2_secondary_rat_usage_data_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 length, guint8 message_type _U_, guint8 instance _U_, session_args_t * args _U_) { int offset = 0; - static const int *secondary_rat_usage_data_report_flags[] = { + static int * const secondary_rat_usage_data_report_flags[] = { &hf_gtpv2_secondary_rat_usage_data_report_spare_bits, &hf_gtpv2_secondary_rat_usage_data_report_bit2, &hf_gtpv2_secondary_rat_usage_data_report_bit1, @@ -7615,7 +7615,7 @@ dissect_gtpv2_max_pkt_loss_rte(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree int offset = 0; guint8 oct; - static const int* flags_oct1[] = { + static int* const flags_oct1[] = { &hf_gtpv2_spare_b7_b2, &hf_gtpv2_max_pkt_loss_rte_dl_flg, &hf_gtpv2_max_pkt_loss_rte_ul_flg, @@ -7660,7 +7660,7 @@ dissect_gtpv2_apn_rte_cntrl_status(tvbuff_t* tvb, packet_info* pinfo _U_, proto_ } /* 3GPP TS 32.422 V15.1.0 (2018-06) 5.5 List of interfaces (O)*/ -static const int* ext_tra_info_list_of_if_flags_oct1[] = { +static int* const ext_tra_info_list_of_if_flags_oct1[] = { &hf_gtpv2_ext_tra_info_loi_mscs_cap, &hf_gtpv2_ext_tra_info_loi_mscs_map_f, &hf_gtpv2_ext_tra_info_loi_mscs_map_e, @@ -7672,20 +7672,20 @@ static const int* ext_tra_info_list_of_if_flags_oct1[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct2[] = { +static int* const ext_tra_info_list_of_if_flags_oct2[] = { &hf_gtpv2_ext_tra_info_loi_mscs_map_c, &hf_gtpv2_ext_tra_info_loi_mscs_map_d, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct3[] = { +static int* const ext_tra_info_list_of_if_flags_oct3[] = { &hf_gtpv2_ext_tra_info_loi_mgw_iuup, &hf_gtpv2_ext_tra_info_loi_mgw_nbup, &hf_gtpv2_ext_tra_info_loi_mgw_mc, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct4[] = { +static int* const ext_tra_info_list_of_if_flags_oct4[] = { &hf_gtpv2_ext_tra_info_loi_sgsn_ge, &hf_gtpv2_ext_tra_info_loi_sgsn_gs, &hf_gtpv2_ext_tra_info_loi_sgsn_map_gf, @@ -7697,7 +7697,7 @@ static const int* ext_tra_info_list_of_if_flags_oct4[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct5[] = { +static int* const ext_tra_info_list_of_if_flags_oct5[] = { &hf_gtpv2_ext_tra_info_loi_sgsn_s13, &hf_gtpv2_ext_tra_info_loi_sgsn_s3, &hf_gtpv2_ext_tra_info_loi_sgsn_s4, @@ -7705,14 +7705,14 @@ static const int* ext_tra_info_list_of_if_flags_oct5[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct6[] = { +static int* const ext_tra_info_list_of_if_flags_oct6[] = { &hf_gtpv2_ext_tra_info_loi_ggsn_gmb, &hf_gtpv2_ext_tra_info_loi_ggsn_gi, &hf_gtpv2_ext_tra_info_loi_ggsn_gn, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct7[] = { +static int* const ext_tra_info_list_of_if_flags_oct7[] = { &hf_gtpv2_ext_tra_info_loi_rnc_uu, &hf_gtpv2_ext_tra_info_loi_rnc_iub, &hf_gtpv2_ext_tra_info_loi_rnc_iur, @@ -7720,12 +7720,12 @@ static const int* ext_tra_info_list_of_if_flags_oct7[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct8[] = { +static int* const ext_tra_info_list_of_if_flags_oct8[] = { &hf_gtpv2_ext_tra_info_loi_bm_sc_gmb, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct9[] = { +static int* const ext_tra_info_list_of_if_flags_oct9[] = { &hf_gtpv2_ext_tra_info_loi_mme_s13, &hf_gtpv2_ext_tra_info_loi_mme_s11, &hf_gtpv2_ext_tra_info_loi_mme_s10, @@ -7735,7 +7735,7 @@ static const int* ext_tra_info_list_of_if_flags_oct9[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct10[] = { +static int* const ext_tra_info_list_of_if_flags_oct10[] = { &hf_gtpv2_ext_tra_info_loi_sgw_gxc, &hf_gtpv2_ext_tra_info_loi_sgw_s11, &hf_gtpv2_ext_tra_info_loi_sgw_s8b, @@ -7744,7 +7744,7 @@ static const int* ext_tra_info_list_of_if_flags_oct10[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct11[] = { +static int* const ext_tra_info_list_of_if_flags_oct11[] = { &hf_gtpv2_ext_tra_info_loi_pdn_gw_sgi, &hf_gtpv2_ext_tra_info_loi_pdn_gw_s8b, &hf_gtpv2_ext_tra_info_loi_pdn_gw_gx, @@ -7756,14 +7756,14 @@ static const int* ext_tra_info_list_of_if_flags_oct11[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct12[] = { +static int* const ext_tra_info_list_of_if_flags_oct12[] = { &hf_gtpv2_ext_tra_info_loi_enb_uu, &hf_gtpv2_ext_tra_info_loi_enb_x2, &hf_gtpv2_ext_tra_info_loi_enb_s1_mme, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct13[] = { +static int* const ext_tra_info_list_of_if_flags_oct13[] = { &hf_gtpv2_ext_tra_info_loi_hss_sh, &hf_gtpv2_ext_tra_info_loi_hss_s6a, &hf_gtpv2_ext_tra_info_loi_hss_s6d, @@ -7775,7 +7775,7 @@ static const int* ext_tra_info_list_of_if_flags_oct13[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct14[] = { +static int* const ext_tra_info_list_of_if_flags_oct14[] = { &hf_gtpv2_ext_tra_info_loi_eir_map_gf, &hf_gtpv2_ext_tra_info_loi_eir_s13p, &hf_gtpv2_ext_tra_info_loi_eir_s13, @@ -7783,7 +7783,7 @@ static const int* ext_tra_info_list_of_if_flags_oct14[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct15[] = { +static int* const ext_tra_info_list_of_if_flags_oct15[] = { &hf_gtpv2_ext_tra_info_loi_amf_n20, &hf_gtpv2_ext_tra_info_loi_amf_n15, &hf_gtpv2_ext_tra_info_loi_amf_n14, @@ -7795,20 +7795,20 @@ static const int* ext_tra_info_list_of_if_flags_oct15[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct16[] = { +static int* const ext_tra_info_list_of_if_flags_oct16[] = { &hf_gtpv2_ext_tra_info_loi_amf_n22, &hf_gtpv2_ext_tra_info_loi_amf_n26, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct17[] = { +static int* const ext_tra_info_list_of_if_flags_oct17[] = { &hf_gtpv2_ext_tra_info_loi_pcf_n15, &hf_gtpv2_ext_tra_info_loi_pcf_n7, &hf_gtpv2_ext_tra_info_loi_pcf_n5, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct18[] = { +static int* const ext_tra_info_list_of_if_flags_oct18[] = { &hf_gtpv2_ext_tra_info_loi_smf_s5_c, &hf_gtpv2_ext_tra_info_loi_smf_n11, &hf_gtpv2_ext_tra_info_loi_smf_n10, @@ -7817,12 +7817,12 @@ static const int* ext_tra_info_list_of_if_flags_oct18[] = { NULL }; -static const int* ext_tra_info_list_of_if_flags_oct19[] = { +static int* const ext_tra_info_list_of_if_flags_oct19[] = { &hf_gtpv2_ext_tra_info_loi_upf_n4, NULL }; -static const int* ext_tra_info_list_of_if_flags_oct20[] = { +static int* const ext_tra_info_list_of_if_flags_oct20[] = { &hf_gtpv2_ext_tra_info_loi_ng_ran_node_e1_c, &hf_gtpv2_ext_tra_info_loi_ng_ran_node_f1_c, &hf_gtpv2_ext_tra_info_loi_ng_ran_node_Uu, @@ -8519,7 +8519,7 @@ dissect_gtpv2(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data gtpv2_hdr_t * gtpv2_hdr = NULL; guint64 gtpv2_hdr_flags; - static const int * gtpv2_flags[] = { + static int * const gtpv2_flags[] = { &hf_gtpv2_version, &hf_gtpv2_p, &hf_gtpv2_t, diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c index 04673ffdf0..3d573d5b3f 100644 --- a/epan/dissectors/packet-gvsp.c +++ b/epan/dissectors/packet-gvsp.c @@ -1031,20 +1031,20 @@ static int hf_gvsp_gendc_part_header_type_specific_info_v2_2 = -1; static int hf_gvsp_gendc_part_header_1D_size_v2_2 = -1; static int hf_gvsp_gendc_part_header_1D_padding_v2_2 = -1; -static const int *pixelformat_fields[] = { +static int * const pixelformat_fields[] = { &hf_gvsp_pixelcolor, &hf_gvsp_pixeloccupy, &hf_gvsp_pixelid, NULL }; -static const int *fieldinfo_fields[] = { +static int * const fieldinfo_fields[] = { &hf_gvsp_fieldid, &hf_gvsp_fieldcount, NULL }; -static const int *cs_fields[] = { +static int * const cs_fields[] = { &hf_gvsp_cs0, &hf_gvsp_cs1, &hf_gvsp_cs2, @@ -1052,7 +1052,7 @@ static const int *cs_fields[] = { NULL }; -static const int *sc_zone_direction_fields[] = { +static int * const sc_zone_direction_fields[] = { &hf_gvsp_sc_zone0_direction, &hf_gvsp_sc_zone1_direction, &hf_gvsp_sc_zone2_direction, @@ -1088,20 +1088,20 @@ static const int *sc_zone_direction_fields[] = { NULL }; -static const int *zoneinfo_fields[] = { +static int * const zoneinfo_fields[] = { &hf_gvsp_zoneid, &hf_gvsp_endofzone, NULL }; -static const int *zoneinfo_multipart_fields[] = { +static int * const zoneinfo_multipart_fields[] = { &hf_gvsp_endofpart, &hf_gvsp_zoneid, &hf_gvsp_endofzone, NULL }; -static const int *flags_fields[] = { +static int * const flags_fields[] = { &hf_gvsp_flagdevicespecific0, &hf_gvsp_flagdevicespecific1, &hf_gvsp_flagdevicespecific2, @@ -1116,13 +1116,13 @@ static const int *flags_fields[] = { NULL }; -static const int *gendc_leader_flags_fields[] = { +static int * const gendc_leader_flags_fields[] = { &hf_gvsp_gendc_leader_flags_reserved_v2_2, &hf_gvsp_gendc_leader_flags_preliminary_descriptor_v2_2, NULL }; -static const int *gendc_payload_data_flags_fields[] = { +static int * const gendc_payload_data_flags_fields[] = { &hf_gvsp_gendc_payload_data_flag_descriptor_flags_v2_2, &hf_gvsp_gendc_payload_data_flag_start_of_descriptor_data_v2_2, &hf_gvsp_gendc_payload_data_flag_end_of_descriptor_data_v2_2, @@ -1130,20 +1130,20 @@ static const int *gendc_payload_data_flags_fields[] = { NULL }; -static const int *gendc_payload_flow_flags_fields[] = { +static int * const gendc_payload_flow_flags_fields[] = { &hf_gvsp_gendc_payload_flow_flag_first_packet_v2_2, &hf_gvsp_gendc_payload_flow_flag_last_packet_v2_2, NULL }; -static const int *gendc_container_header_flags_fields[] = { +static int * const gendc_container_header_flags_fields[] = { &hf_gvsp_gendc_container_header_flags_timestamp_ptp_v2_2, &hf_gvsp_gendc_container_header_flags_component_invalid_v2_2, &hf_gvsp_gendc_container_header_flags_reserved_v2_2, NULL }; -static const int *gendc_container_header_variable_fields_fields[] = { +static int * const gendc_container_header_variable_fields_fields[] = { &hf_gvsp_gendc_container_header_variable_fields_data_size_v2_2, &hf_gvsp_gendc_container_header_variable_fields_size_x_v2_2, &hf_gvsp_gendc_container_header_variable_fields_size_y_v2_2, @@ -1156,7 +1156,7 @@ static const int *gendc_container_header_variable_fields_fields[] = { NULL }; -static const int *gendc_component_header_flags_fields[] = { +static int * const gendc_component_header_flags_fields[] = { &hf_gvsp_gendc_component_header_flags_invalid_v2_2, &hf_gvsp_gendc_component_header_flags_reserved_v2_2, NULL diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 4f2c98c2f1..b6bd90a6d8 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -3917,7 +3917,7 @@ dissect_h248_SignalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * NotifyCompletion_bits[] = { +static int * const NotifyCompletion_bits[] = { &hf_h248_NotifyCompletion_onTimeOut, &hf_h248_NotifyCompletion_onInterruptByEvent, &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr, @@ -4401,7 +4401,7 @@ dissect_h248_DigitMapDescriptor(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const int * T_auditToken_bits[] = { +static int * const T_auditToken_bits[] = { &hf_h248_T_auditToken_muxToken, &hf_h248_T_auditToken_modemToken, &hf_h248_T_auditToken_mediaToken, diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index a2c08dcce8..76e4b83f75 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -50,7 +50,7 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U proto_item *ti = NULL; proto_tree *h261_tree = NULL; unsigned int offset = 0; - static const int * bits[] = { + static int * const bits[] = { /* SBIT 1st octet, 3 bits */ &hf_h261_sbit, /* EBIT 1st octet, 3 bits */ diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index ee7be724d3..aa0ab6b575 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -2525,7 +2525,7 @@ dissect_h264(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* Capability */ -static const int *profile_fields[] = { +static int * const profile_fields[] = { &hf_h264_par_profile_b, &hf_h264_par_profile_m, &hf_h264_par_profile_e, @@ -2548,7 +2548,7 @@ dissect_h264_par_profile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree return offset; } -static const int *AdditionalModesSupported_fields[] = { +static int * const AdditionalModesSupported_fields[] = { &hf_h264_par_add_mode_sup_rcdo, NULL }; @@ -2566,7 +2566,7 @@ dissect_h264_par_AdditionalModesSupported(tvbuff_t *tvb, packet_info *pinfo _U_, } -static const int *ProfileIOP_fields[] = { +static int * const ProfileIOP_fields[] = { &hf_h264_par_constraint_set0_flag, &hf_h264_par_constraint_set1_flag, &hf_h264_par_constraint_set2_flag, diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index d88e10f6f6..cff727ce08 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -232,7 +232,7 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) guint32 k_frame_number; guint32 ident_length; guint32 command_length; - static const int *flags_fields[] = { + static int * const flags_fields[] = { &hf_flags_trusted_socket, NULL }; diff --git a/epan/dissectors/packet-hiqnet.c b/epan/dissectors/packet-hiqnet.c index 209bf99f8e..9e3c0ba8ba 100644 --- a/epan/dissectors/packet-hiqnet.c +++ b/epan/dissectors/packet-hiqnet.c @@ -399,7 +399,7 @@ static int hf_hiqnet_newdevaddr = -1; static expert_field ei_hiqnet_datatype = EI_INIT; -static const int *hiqnet_flag_fields[] = { +static int * const hiqnet_flag_fields[] = { &hf_hiqnet_reqack_flag, &hf_hiqnet_ack_flag, &hf_hiqnet_info_flag, @@ -410,7 +410,7 @@ static const int *hiqnet_flag_fields[] = { NULL }; -static const int *hiqnet_cat_fields[] = { +static int * const hiqnet_cat_fields[] = { &hf_hiqnet_app_cat, &hf_hiqnet_conf_cat, &hf_hiqnet_audionet_cat, diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index 7faee0382d..5ec5262643 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -1795,7 +1795,7 @@ static const value_string homeplug_av_fc_del_type_vals[] = { #define HOMEPLUG_AV_RSP_DATA_MASK 0x03 #define HOMEPLUG_AV_RSP_MGMT_MASK 0x0C -static const int *rsof_sack_fields[] = { +static int * const rsof_sack_fields[] = { &hf_homeplug_av_cfs, &hf_homeplug_av_bdf, &hf_homeplug_av_svn, @@ -2560,7 +2560,7 @@ dissect_homeplug_av_beacon_payload(ptvcursor_t *cursor) tree = ptvcursor_tree(cursor); tvb = ptvcursor_tvbuff(cursor); - static const int *bcn1_fields[] = { + static int * const bcn1_fields[] = { &hf_homeplug_av_bcn_nid, &hf_homeplug_av_bcn_hm, NULL @@ -2571,7 +2571,7 @@ dissect_homeplug_av_beacon_payload(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_bcn_stei, 1, ENC_BIG_ENDIAN); - static const int *bcn2_fields[] = { + static int * const bcn2_fields[] = { &hf_homeplug_av_bcn_type, &hf_homeplug_av_bcn_ncnr, &hf_homeplug_av_bcn_npsm, @@ -2584,7 +2584,7 @@ dissect_homeplug_av_beacon_payload(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_bcn_slot_use, 1, ENC_BIG_ENDIAN); - static const int *bcn3_fields[] = { + static int * const bcn3_fields[] = { &hf_homeplug_av_bcn_slot_id, &hf_homeplug_av_bcn_aclss, &hf_homeplug_av_bcn_hoip, @@ -2595,7 +2595,7 @@ dissect_homeplug_av_beacon_payload(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 1, bcn3_fields, ENC_BIG_ENDIAN); ptvcursor_advance(cursor, 1); - static const int *bcn4_fields[] = { + static int * const bcn4_fields[] = { &hf_homeplug_av_bcn_nm, &hf_homeplug_av_bcn_cco_cap, &hf_homeplug_av_bcn_rsf, @@ -2658,7 +2658,7 @@ dissect_homeplug_av_start_of_frame(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_dtei, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_lid, 1, ENC_BIG_ENDIAN); - static const int *sof1_fields[] = { + static int * const sof1_fields[] = { &hf_homeplug_av_cfs, &hf_homeplug_av_bdf, &hf_homeplug_av_hp10df, @@ -2673,7 +2673,7 @@ dissect_homeplug_av_start_of_frame(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_ppb, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_sof_ble, 1, ENC_BIG_ENDIAN); - static const int *sof2_fields[] = { + static int * const sof2_fields[] = { &hf_homeplug_av_sof_pbsz, &hf_homeplug_av_sof_num_sym, &hf_homeplug_av_sof_tmi_av, @@ -2683,7 +2683,7 @@ dissect_homeplug_av_start_of_frame(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 1, sof2_fields, ENC_BIG_ENDIAN); ptvcursor_advance(cursor, 1); - static const int *sof3_fields[] = { + static int * const sof3_fields[] = { &hf_homeplug_av_fl_av, &hf_homeplug_av_sof_mpdu_cnt, &hf_homeplug_av_sof_burst_cnt, @@ -2693,7 +2693,7 @@ dissect_homeplug_av_start_of_frame(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 2, sof3_fields, ENC_LITTLE_ENDIAN); ptvcursor_advance(cursor, 2); - static const int *sof4_fields[] = { + static int * const sof4_fields[] = { &hf_homeplug_av_sof_bbf, &hf_homeplug_av_sof_mrtfl, &hf_homeplug_av_sof_dccpcf, @@ -2705,7 +2705,7 @@ dissect_homeplug_av_start_of_frame(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 1, sof4_fields, ENC_BIG_ENDIAN); ptvcursor_advance(cursor, 1); - static const int *sof5_fields[] = { + static int * const sof5_fields[] = { &hf_homeplug_av_sof_rsr, &hf_homeplug_av_sof_clst, &hf_homeplug_av_sof_mfs_cmd_mgmt, @@ -2716,7 +2716,7 @@ dissect_homeplug_av_start_of_frame(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 1, sof5_fields, ENC_BIG_ENDIAN); ptvcursor_advance(cursor, 1); - static const int *sof6_fields[] = { + static int * const sof6_fields[] = { &hf_homeplug_av_sof_mfs_rsp_mgmt, &hf_homeplug_av_sof_mfs_rsp_data, &hf_homeplug_av_sof_bm_sack, @@ -2783,7 +2783,7 @@ dissect_homeplug_av_rtscts(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_dtei, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_lid, 1, ENC_BIG_ENDIAN); - static const int *rtscts_fields[] = { + static int * const rtscts_fields[] = { &hf_homeplug_av_cfs, &hf_homeplug_av_bdf, &hf_homeplug_av_hp10df, @@ -2827,7 +2827,7 @@ dissect_homeplug_av_sound(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_dtei, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_lid, 1, ENC_BIG_ENDIAN); - static const int *sound1_fields[] = { + static int * const sound1_fields[] = { &hf_homeplug_av_cfs, &hf_homeplug_av_sound_pbsz, &hf_homeplug_av_sound_bdf, @@ -2840,7 +2840,7 @@ dissect_homeplug_av_sound(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 1, sound1_fields, ENC_BIG_ENDIAN); ptvcursor_advance(cursor, 1); - static const int *sound2_fields[] = { + static int * const sound2_fields[] = { &hf_homeplug_av_fl_av, &hf_homeplug_av_sound_mpdu_cnt, NULL @@ -2852,7 +2852,7 @@ dissect_homeplug_av_sound(ptvcursor_t *cursor) ptvcursor_add(cursor, hf_homeplug_av_ppb, 1, ENC_BIG_ENDIAN); ptvcursor_add(cursor, hf_homeplug_av_sound_src, 1, ENC_BIG_ENDIAN); - static const int *sound3_fields[] = { + static int * const sound3_fields[] = { &hf_homeplug_av_sound_add_req_tm, &hf_homeplug_av_sound_max_pb_sym, &hf_homeplug_av_sound_ecsf, @@ -2863,7 +2863,7 @@ dissect_homeplug_av_sound(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 1, sound3_fields, ENC_BIG_ENDIAN); ptvcursor_advance(cursor, 1); - static const int *sound4_fields[] = { + static int * const sound4_fields[] = { &hf_homeplug_av_sound_ems, &hf_homeplug_av_sound_esgisf, &hf_homeplug_av_sound_elgisf, @@ -2903,7 +2903,7 @@ dissect_homeplug_av_rsof(ptvcursor_t *cursor) ptvcursor_advance(cursor, 8); /* 1 byte for bitmask field, plus 7 bytes of variable data */ /* TODO: fill in variable fields */ - static const int *rsof2_fields[] = { + static int * const rsof2_fields[] = { &hf_homeplug_av_rsof_fl, &hf_homeplug_av_rsof_tmi, &hf_homeplug_av_rsof_pbsz, @@ -2913,7 +2913,7 @@ dissect_homeplug_av_rsof(ptvcursor_t *cursor) proto_tree_add_bitmask_list(tree, tvb, ptvcursor_current_offset(cursor), 2, rsof2_fields, ENC_LITTLE_ENDIAN); ptvcursor_advance(cursor, 2); - static const int *rsof3_fields[] = { + static int * const rsof3_fields[] = { &hf_homeplug_av_rsof_num_sym, &hf_homeplug_av_rsof_mfs_cmd_mgmt, &hf_homeplug_av_rsof_mfs_cmd_data, @@ -3901,7 +3901,7 @@ dissect_homeplug_av_sniffer_ind(ptvcursor_t *cursor) del_type &= bitmask; - static const int *frame_control_fields[] = { + static int * const frame_control_fields[] = { &hf_homeplug_av_fc_del_type, &hf_homeplug_av_fc_access, &hf_homeplug_av_fc_snid, diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 00af8ed3e1..c579c03239 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -74,7 +74,7 @@ dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree *hp_erm_tree; tvbuff_t *eth_tvb; int offset = 0; - const gint *flags[] = { + int * const flags[] = { &hf_hp_erm_unknown2, &hf_hp_erm_priority, &hf_hp_erm_cfi, diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 465cb5cbe7..cdb2e564dd 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -2165,9 +2165,9 @@ dissect_http2_header_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht { guint64 flags_val; - const int** fields; + int* const * fields; - static const int* http2_hdr_flags[] = { + static int* const http2_hdr_flags[] = { &hf_http2_flags_unused_headers, &hf_http2_flags_priority, &hf_http2_flags_padded, @@ -2176,40 +2176,40 @@ dissect_http2_header_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ht NULL }; - static const int* http2_data_flags[] = { + static int* const http2_data_flags[] = { &hf_http2_flags_unused_data, &hf_http2_flags_padded, &hf_http2_flags_end_stream, NULL }; - static const int* http2_settings_flags[] = { + static int* const http2_settings_flags[] = { &hf_http2_flags_unused_settings, &hf_http2_flags_settings_ack, NULL }; - static const int* http2_push_promise_flags[] = { + static int* const http2_push_promise_flags[] = { &hf_http2_flags_unused_push_promise, &hf_http2_flags_padded, &hf_http2_flags_end_headers, NULL }; - static const int* http2_continuation_flags[] = { + static int* const http2_continuation_flags[] = { &hf_http2_flags_unused_continuation, &hf_http2_flags_padded, &hf_http2_flags_end_headers, NULL }; - static const int* http2_ping_flags[] = { + static int* const http2_ping_flags[] = { &hf_http2_flags_unused_ping, &hf_http2_flags_ping_ack, NULL }; - static const int* http2_unused_flags[] = { + static int* const http2_unused_flags[] = { &hf_http2_flags_unused, NULL }; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index d00acd16c1..5b3d34b2fb 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -136,7 +136,7 @@ static int hf_iax2_cap_speex16 = -1; static int hf_iax2_cap_opus = -1; static int hf_iax2_cap_testlaw = -1; -static const int *hf_iax2_caps[] = { +static int * const hf_iax2_caps[] = { &hf_iax2_cap_g723_1, &hf_iax2_cap_gsm, &hf_iax2_cap_ulaw, diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 974c37e518..22546afbee 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -501,7 +501,7 @@ dissect_mip_extensions(tvbuff_t * tvb, int offset, proto_tree * tree) proto_tree *mip_tree = NULL; gint numCOAs; gint i; - static const int * flags[] = { + static int * const flags[] = { &hf_icmp_mip_r, &hf_icmp_mip_b, &hf_icmp_mip_h, @@ -792,7 +792,7 @@ dissect_interface_information_object(tvbuff_t * tvb, gint offset, name_flag = (c_type & INT_INFO_NAME) >> 1; { - static const gint *c_type_fields[] = { + static int * const c_type_fields[] = { &hf_icmp_int_info_role, &hf_icmp_int_info_reserved, &hf_icmp_int_info_ifindex, diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index bd13d18051..e0b34876d2 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1748,7 +1748,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case ND_OPT_PREFIX_INFORMATION: /* Prefix Information (3) */ { - static const int * prefix_flag[] = { + static int * const prefix_flag[] = { &hf_icmpv6_opt_prefix_flag_l, &hf_icmpv6_opt_prefix_flag_a, &hf_icmpv6_opt_prefix_flag_r, @@ -2118,7 +2118,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case ND_OPT_MAP: /* MAP Option (23) */ { - static const int * map_flags[] = { + static int * const map_flags[] = { &hf_icmpv6_opt_map_flag_r, &hf_icmpv6_opt_map_flag_reserved, NULL @@ -2151,7 +2151,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree guint8 route_preference; ws_in6_addr prefix; address prefix_addr; - static const int * route_flags[] = { + static int * const route_flags[] = { &hf_icmpv6_opt_route_info_flag_route_preference, &hf_icmpv6_opt_route_info_flag_reserved, NULL @@ -2220,7 +2220,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case ND_OPT_FLAGS_EXTENSION: /* RA Flags Extension Option (26) */ { - static const int * extension_flags[] = { + static int * const extension_flags[] = { &hf_icmpv6_opt_efo_m, &hf_icmpv6_opt_efo_o, &hf_icmpv6_opt_efo_h, @@ -2429,7 +2429,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree guint8 context_len; ws_in6_addr context_prefix; address context_prefix_addr; - static const int * _6lowpan_context_flags[] = { + static int * const _6lowpan_context_flags[] = { &hf_icmpv6_opt_6co_flag_c, &hf_icmpv6_opt_6co_flag_cid, &hf_icmpv6_opt_6co_flag_reserved, @@ -2661,7 +2661,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree gint metric_len; while (opt_offset < offset + opt_len) { - static const int * rpl_metric_flags[] = { + static int * const rpl_metric_flags[] = { &hf_icmpv6_rpl_opt_metric_reserved, &hf_icmpv6_rpl_opt_metric_flag_p, &hf_icmpv6_rpl_opt_metric_flag_c, @@ -2694,7 +2694,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree switch(metric_constraint_type) { case RPL_METRIC_NSA: /* Node State and Attribute Object */ { - static const int * metric_nsa_flags[] = { + static int * const metric_nsa_flags[] = { &hf_icmpv6_rpl_opt_metric_nsa_object_reserved, &hf_icmpv6_rpl_opt_metric_nsa_object_flags, &hf_icmpv6_rpl_opt_metric_nsa_object_flag_a, @@ -2736,7 +2736,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case RPL_METRIC_NE: /* Node Energy */ { - static const int * metric_ne_flags[] = { + static int * const metric_ne_flags[] = { &hf_icmpv6_rpl_opt_metric_ne_object_flags, &hf_icmpv6_rpl_opt_metric_ne_object_flag_i, &hf_icmpv6_rpl_opt_metric_ne_object_type, @@ -2754,7 +2754,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } case RPL_METRIC_HP: /* Hop Count Object */ { - static const int * metric_hp_flags[] = { + static int * const metric_hp_flags[] = { &hf_icmpv6_rpl_opt_metric_hp_object_reserved, &hf_icmpv6_rpl_opt_metric_hp_object_flags, &hf_icmpv6_rpl_opt_metric_hp_object_hp, @@ -2779,7 +2779,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree break; case RPL_METRIC_LQL: /* Link Quality Level Object */ { - static const int * metric_lql_flags[] = { + static int * const metric_lql_flags[] = { &hf_icmpv6_rpl_opt_metric_lql_object_val, &hf_icmpv6_rpl_opt_metric_lql_object_counter, NULL @@ -2831,7 +2831,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree guint8 prefix_len; ws_in6_addr prefix; address prefix_addr; - static const int * rpl_flags[] = { + static int * const rpl_flags[] = { &hf_icmpv6_rpl_opt_route_pref, &hf_icmpv6_rpl_opt_route_reserved, NULL @@ -2875,7 +2875,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree break; } case RPL_OPT_CONFIG: { - static const int * rpl_config_flags[] = { + static int * const rpl_config_flags[] = { &hf_icmpv6_rpl_opt_config_reserved, &hf_icmpv6_rpl_opt_config_auth, &hf_icmpv6_rpl_opt_config_pcs, @@ -2964,7 +2964,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree break; } case RPL_OPT_TRANSIT: { - static const int * rpl_transit_flags[] = { + static int * const rpl_transit_flags[] = { &hf_icmpv6_rpl_opt_transit_flag_e, &hf_icmpv6_rpl_opt_transit_flag_rsv, NULL @@ -2998,7 +2998,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree break; } case RPL_OPT_SOLICITED: { - static const int * rpl_solicited_flags[] = { + static int * const rpl_solicited_flags[] = { &hf_icmpv6_rpl_opt_solicited_flag_v, &hf_icmpv6_rpl_opt_solicited_flag_i, &hf_icmpv6_rpl_opt_solicited_flag_d, @@ -3028,7 +3028,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case RPL_OPT_PREFIX: { /* Destination prefix option. */ guint32 prefix_len; - static const int * rpl_prefix_flags[] = { + static int * const rpl_prefix_flags[] = { &hf_icmpv6_rpl_opt_prefix_flag_l, &hf_icmpv6_rpl_opt_prefix_flag_a, &hf_icmpv6_rpl_opt_prefix_flag_r, @@ -3203,12 +3203,12 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto if(icmp6_code & ICMP6_RPL_SECURE) { guint8 kim, lvl; - static const int * rpl_secure_flags[] = { + static int * const rpl_secure_flags[] = { &hf_icmpv6_rpl_secure_flag_t, &hf_icmpv6_rpl_secure_flag_rsv, NULL }; - static const int * rpl_secure_flags2[] = { + static int * const rpl_secure_flags2[] = { &hf_icmpv6_rpl_secure_kim, &hf_icmpv6_rpl_secure_lvl, &hf_icmpv6_rpl_secure_rsv, @@ -3294,7 +3294,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto case ICMP6_RPL_DIO: /* DODAG Information Object (1) */ case ICMP6_RPL_SDIO: /* Secure DODAG Information Object (129) */ { - static const int * rpl_dio_flags[] = { + static int * const rpl_dio_flags[] = { &hf_icmpv6_rpl_dio_flag_g, &hf_icmpv6_rpl_dio_flag_0, &hf_icmpv6_rpl_dio_flag_mop, @@ -3343,7 +3343,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto case ICMP6_RPL_SDAO: /* Secure Destination Advertisement Object (130) */ { guint8 flags; - static const int * rpl_dao_flags[] = { + static int * const rpl_dao_flags[] = { &hf_icmpv6_rpl_dao_flag_k, &hf_icmpv6_rpl_dao_flag_d, &hf_icmpv6_rpl_dao_flag_rsv, @@ -3382,7 +3382,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto case ICMP6_RPL_SDAOACK: /* Secure Destination Advertisement Object Acknowledgment (131) */ { guint8 flags; - static const int * rpl_daoack_flags[] = { + static int * const rpl_daoack_flags[] = { &hf_icmpv6_rpl_daoack_flag_d, &hf_icmpv6_rpl_daoack_flag_rsv, NULL @@ -3419,7 +3419,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto } case ICMP6_RPL_CC: { - static const int * rpl_cc_flags[] = { + static int * const rpl_cc_flags[] = { &hf_icmpv6_rpl_cc_flag_r, &hf_icmpv6_rpl_cc_flag_rsv, NULL @@ -3453,7 +3453,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto case ICMP6_RPL_P2P_DRO: /* P2P Discovery Reply Object (0x4) */ case ICMP6_RPL_P2P_SDRO: /* Secure P2P Discovery Reply Object (0x84) */ { - static const int * rpl_p2p_dro_flags[] = { + static int * const rpl_p2p_dro_flags[] = { &hf_icmpv6_rpl_p2p_dro_flag_stop, &hf_icmpv6_rpl_p2p_dro_flag_ack, &hf_icmpv6_rpl_p2p_dro_flag_seq, @@ -3488,7 +3488,7 @@ dissect_rpl_control(tvbuff_t *tvb, int rpl_offset, packet_info *pinfo _U_, proto case ICMP6_RPL_P2P_DROACK: /* P2P Discovery Reply Object Acknowledgement (0x5) */ case ICMP6_RPL_P2P_SDROACK: /* Secure P2P Discovery Reply Object Acknowledgement (0x85) */ { - static const int * rpl_p2p_droack_flags[] = { + static int * const rpl_p2p_droack_flags[] = { &hf_icmpv6_rpl_p2p_droack_flag_seq, &hf_icmpv6_rpl_p2p_droack_flag_reserved, NULL @@ -3526,7 +3526,7 @@ dissect_nodeinfo(tvbuff_t *tvb, int ni_offset, packet_info *pinfo _U_, proto_tre { guint16 qtype; guint used_bytes; - static const int * ni_flags[] = { + static int * const ni_flags[] = { &hf_icmpv6_ni_flag_g, &hf_icmpv6_ni_flag_s, &hf_icmpv6_ni_flag_l, @@ -3638,7 +3638,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree { proto_tree *mp_tree, *up_tree, *rm_tree; proto_item *ti, *ti_mp, *ti_up, *ti_rm; - static const int * rr_flags[] = { + static int * const rr_flags[] = { &hf_icmpv6_rr_flag_t, &hf_icmpv6_rr_flag_r, &hf_icmpv6_rr_flag_a, @@ -3726,19 +3726,19 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree while ((int)tvb_reported_length(tvb) > rr_offset) { /* Use-Prefix Part */ guint8 uselen, keeplen; - static const int * mask_flags[] = { + static int * const mask_flags[] = { &hf_icmpv6_rr_pco_up_flagmask_l, &hf_icmpv6_rr_pco_up_flagmask_a, &hf_icmpv6_rr_pco_up_flagmask_reserved, NULL }; - static const int * ra_flags[] = { + static int * const ra_flags[] = { &hf_icmpv6_rr_pco_up_raflags_l, &hf_icmpv6_rr_pco_up_raflags_a, &hf_icmpv6_rr_pco_up_raflags_reserved, NULL }; - static const int * up_flags[] = { + static int * const up_flags[] = { &hf_icmpv6_rr_pco_up_flag_v, &hf_icmpv6_rr_pco_up_flag_p, &hf_icmpv6_rr_pco_up_flag_reserved, @@ -3790,7 +3790,7 @@ dissect_rrenum(tvbuff_t *tvb, int rr_offset, packet_info *pinfo _U_, proto_tree while ((int)tvb_reported_length(tvb) > rr_offset) { guint8 matchlen; guint32 interfaceindex; - static const int * rm_flags[] = { + static int * const rm_flags[] = { &hf_icmpv6_rr_rm_flag_reserved, &hf_icmpv6_rr_rm_flag_b, &hf_icmpv6_rr_rm_flag_f, @@ -4226,7 +4226,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if ((icmp6_type == ICMP6_MEMBERSHIP_QUERY) && (length >= MLDV2_PACKET_MINLEN)) { guint32 mrc; guint16 qqi, i, nb_sources; - static const int * mld_flags[] = { + static int * const mld_flags[] = { &hf_icmpv6_mld_flag_s, &hf_icmpv6_mld_flag_qrv, &hf_icmpv6_mld_flag_rsv, @@ -4299,7 +4299,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } case ICMP6_ND_ROUTER_ADVERT: /* Router Advertisement (134) */ { - static const int * nd_ra_flags[] = { + static int * const nd_ra_flags[] = { &hf_icmpv6_nd_ra_flag_m, &hf_icmpv6_nd_ra_flag_o, &hf_icmpv6_nd_ra_flag_h, @@ -4353,7 +4353,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { guint32 na_flags; wmem_strbuf_t *flags_strbuf = wmem_strbuf_new_label(wmem_packet_scope()); - static const int * nd_na_flags[] = { + static int * const nd_na_flags[] = { &hf_icmpv6_nd_na_flag_r, &hf_icmpv6_nd_na_flag_s, &hf_icmpv6_nd_na_flag_o, @@ -4481,7 +4481,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } case ICMP6_MIP6_MPA: /* Mobile Prefix Advertisement (147) */ { - static const int * mip6_flags[] = { + static int * const mip6_flags[] = { &hf_icmpv6_mip6_flag_m, &hf_icmpv6_mip6_flag_o, &hf_icmpv6_mip6_flag_rsv, @@ -4565,7 +4565,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case FMIP6_SUBTYPE_HI: { - static const int * fmip6_hi_flags[] = { + static int * const fmip6_hi_flags[] = { &hf_icmpv6_fmip6_hi_flag_s, &hf_icmpv6_fmip6_hi_flag_u, &hf_icmpv6_fmip6_hi_flag_reserved, diff --git a/epan/dissectors/packet-ieee1609dot2.c b/epan/dissectors/packet-ieee1609dot2.c index d35e2bff59..17a4ea5629 100644 --- a/epan/dissectors/packet-ieee1609dot2.c +++ b/epan/dissectors/packet-ieee1609dot2.c @@ -1652,7 +1652,7 @@ dissect_ieee1609dot2_INTEGER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * EndEntityType_bits[] = { +static int * const EndEntityType_bits[] = { &hf_ieee1609dot2_EndEntityType_app, &hf_ieee1609dot2_EndEntityType_enrol, NULL diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c index 82f897104d..ed8b8491aa 100644 --- a/epan/dissectors/packet-ieee1722.c +++ b/epan/dissectors/packet-ieee1722.c @@ -858,7 +858,7 @@ static int dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi guint subtype = 0; gint offset = 0; int dissected_size; - const gint *fields[] = { + int * const fields[] = { &hf_1722_svfield, &hf_1722_verfield, NULL @@ -962,7 +962,7 @@ static int dissect_1722_61883(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre guint numSourcePackets = 0; guint i = 0; guint j = 0; - const gint *fields[] = { + int * const fields[] = { &hf_1722_61883_mrfield, &hf_1722_61883_gvfield, &hf_1722_61883_tvfield, @@ -1420,12 +1420,12 @@ static int dissect_1722_aaf (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint format = 0; guint i = 0; guint j = 0; - const gint *fields[] = { + int * const fields[] = { &hf_1722_aaf_mrfield, &hf_1722_aaf_tvfield, NULL }; - const gint *fields_pcm[] = { + int * const fields_pcm[] = { &hf_1722_aaf_sparse_timestamp, &hf_1722_aaf_evtfield, NULL @@ -1643,18 +1643,18 @@ static int dissect_1722_cvf (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint format_subtype = 0; proto_tree *ti_format; - const gint *fields[] = { + int * const fields[] = { &hf_1722_cvf_mrfield, &hf_1722_cvf_tvfield, NULL }; - const gint *fields_cvf[] = { + int * const fields_cvf[] = { &hf_1722_cvf_marker_bit, &hf_1722_cvf_evtfield, NULL }; - const gint *fields_h264[] = { + int * const fields_h264[] = { &hf_1722_cvf_h264_forbidden_bit, &hf_1722_cvf_h264_nri, &hf_1722_cvf_h264_nal_type, @@ -1850,13 +1850,13 @@ static int dissect_1722_crf (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree gint offset = 1; guint datalen = 0; guint j = 0; - const gint *fields[] = { + int * const fields[] = { &hf_1722_crf_mrfield, &hf_1722_crf_fsfield, &hf_1722_crf_tufield, NULL }; - const gint *pull_frequency[] = { + int * const pull_frequency[] = { &hf_1722_crf_pull, &hf_1722_crf_base_frequency, NULL @@ -2000,7 +2000,7 @@ static int dissect_1722_ntscf (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint captured_length = tvb_captured_length(tvb); gint captured_payload_length; - const gint *fields[] = { + int * const fields[] = { &hf_1722_ntscf_rfield, NULL, }; @@ -2472,7 +2472,7 @@ static int dissect_1722_acf_can_common(tvbuff_t *tvb, packet_info *pinfo, proto_ proto_tree *tree_can; proto_tree *tree_can_id; gint can_protocol; - const int **can_flags; + int * const *can_flags; struct can_info can_info; tvbuff_t* next_tvb; @@ -2483,19 +2483,19 @@ static int dissect_1722_acf_can_common(tvbuff_t *tvb, packet_info *pinfo, proto_ : IEEE_1722_ACF_CAN_HEADER_SIZE; - const gint *fields[] = { + int * const fields[] = { &hf_1722_can_mtvfield, &hf_1722_can_fdffield, NULL, }; - const gint *can_std_flags[] = { + int * const can_std_flags[] = { &hf_1722_can_rtrfield, &hf_1722_can_efffield, NULL }; - const gint *can_fd_flags[] = { + int * const can_fd_flags[] = { &hf_1722_can_efffield, &hf_1722_can_brsfield, &hf_1722_can_esifield, diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c index e50a7a596e..e178d0b989 100644 --- a/epan/dissectors/packet-ieee1905.c +++ b/epan/dissectors/packet-ieee1905.c @@ -1558,7 +1558,7 @@ dissect_1905_neighbor_device(tvbuff_t *tvb, packet_info *pinfo _U_, proto_item *pi = NULL; proto_item *neighbor_list = NULL; guint start; - static const int *flags[] = { + static int * const flags[] = { &hf_ieee1905_bridges_flag, NULL, }; @@ -2740,7 +2740,7 @@ static int dissect_ap_capability(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) { - static const int *capabilities[] = { + static int * const capabilities[] = { &hf_ieee1905_unassoc_sta_metrics_oper_flag, &hf_ieee1905_unassoc_sta_metrics_non_oper_flag, &hf_ieee1905_agent_init_steering, @@ -2844,7 +2844,7 @@ static int dissect_ap_ht_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) { - static const int *capabilities[] = { + static int * const capabilities[] = { &hf_ieee1905_max_supported_tx_streams, &hf_ieee1905_max_supported_rx_streams, &hf_ieee1905_short_gi_20mhz_flag, @@ -2871,7 +2871,7 @@ static int dissect_ap_vht_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) { - static const int *capabilities[] = { + static int * const capabilities[] = { &hf_ieee1905_vht_max_supported_tx_streams, &hf_ieee1905_vht_max_supported_rx_streams, &hf_ieee1905_short_gi_80mhz_flag, @@ -2911,7 +2911,7 @@ dissect_ap_he_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, { guint8 he_mcs_count = 0, he_mcs_index = 0; proto_tree *he_mcs_list = NULL; - static const int *he_capabilities[] = { + static int * const he_capabilities[] = { &hf_ieee1905_he_max_supported_tx_streams, &hf_ieee1905_he_max_supported_rx_streams, &hf_ieee1905_he_support_80plus_mhz_flag, @@ -3070,7 +3070,7 @@ dissect_metric_reporting_policy(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *radio_tree = NULL; proto_item *pi = NULL; guint saved_offset = 0; - static const int *ieee1905_reporting_policy_flags[] = { + static int * const ieee1905_reporting_policy_flags[] = { &hf_ieee1905_assoc_sta_traffic_stats_inclusion, &hf_ieee1905_assoc_sta_link_metrics_inclusion, &hf_ieee1905_reporting_policy_flags_reserved, @@ -3143,7 +3143,7 @@ dissect_channel_preference(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *class_list = NULL; proto_item *pi = NULL; guint saved_offset = 0; - static const int *preference[] = { + static int * const preference[] = { &hf_ieee1905_channel_pref_preference, &hf_ieee1905_channel_pref_reason, NULL, @@ -3504,7 +3504,7 @@ dissect_unassociated_sta_link_metric_response(tvbuff_t *tvb, packet_info *pinfo /* * Dissect a Steering request TLV */ -static const int *steering_flags[] = { +static int * const steering_flags[] = { &hf_ieee1905_steering_request_mode_flag, &hf_ieee1905_btm_disassoc_imminent_flag, &hf_ieee1905_btm_abridged_flag, @@ -3984,7 +3984,7 @@ static int dissect_client_association_event(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) { - static const int *association_flags[] = { + static int * const association_flags[] = { &hf_ieee1905_association_flag, &hf_ieee1905_association_event_reserved, NULL, @@ -4052,7 +4052,7 @@ dissect_ap_metrics(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, guint16 len _U_) { guint8 presence_flags = 0; - static const int *flags[] = { + static int * const flags[] = { &hf_ieee1905_include_estimated_spi_ac_eq_be, &hf_ieee1905_include_estimated_spi_ac_eq_bk, &hf_ieee1905_include_estimated_spi_ac_eq_vo, @@ -4459,7 +4459,7 @@ dissect_error_code(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* * Dissect a Channel Scan Reporting Policy TLV */ -static const int * channel_scan_rep_policy_headers[] = { +static int * const channel_scan_rep_policy_headers[] = { &hf_ieee1905_channel_scan_pol_report, &hf_ieee1905_channel_scan_pol_reserved, NULL @@ -4486,7 +4486,7 @@ dissect_channel_scan_reporting_policy(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a Channel Scan Capabilities TLV */ -static const int *channel_scan_capa_flags_headers[] = { +static int * const channel_scan_capa_flags_headers[] = { &hf_ieee1905_channel_scan_capa_flags_on_boot_only, &hf_ieee1905_channel_scan_capa_flags_scan_impact, &hf_ieee1905_channel_scan_capa_flags_reserved, @@ -4622,7 +4622,7 @@ dissect_channel_scan_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a Channel Scan Request TLV */ -static const int *channel_scan_request_flags_headers[] = { +static int * const channel_scan_request_flags_headers[] = { &hf_ieee1905_channel_scan_request_flags_fresh_scan, &hf_ieee1905_channel_scan_request_flags_reserved, NULL @@ -4757,13 +4757,13 @@ static const range_string channel_scan_result_status_rvals[] = { { 0, 0, NULL } }; -static const int *channel_scan_result_neigh_flags[] = { +static int * const channel_scan_result_neigh_flags[] = { &hf_ieee1905_channel_scan_result_load_element_present, &hf_ieee1905_channel_scan_result_neigh_reserved, NULL }; -static const int *channel_scan_result_flags[] = { +static int * const channel_scan_result_flags[] = { &hf_ieee1905_channel_scan_result_scan_type, &hf_ieee1905_channel_scan_result_scan_flags_reserved, NULL @@ -5063,7 +5063,7 @@ dissect_encrypted(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a CAC Request TLV */ -static const int *cac_request_method_flags[] = { +static int * const cac_request_method_flags[] = { &hf_ieee1905_cac_request_method, &hf_ieee1905_cac_request_completion_action, &hf_ieee1905_cac_request_completion_unsuccess, @@ -5633,7 +5633,7 @@ static const value_string byte_counter_units_vals[] = { { 0, NULL } }; -static const int* r2_ap_capa_flags[] = { +static int* const r2_ap_capa_flags[] = { &hf_ieee1905_byte_counter_units, &hf_ieee1905_r2_ap_capa_flags_reserved, NULL @@ -5663,7 +5663,7 @@ dissect_r2_ap_capability(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a Service Prioritization Rule TLV */ -static const int *default_802_1q_settings_flags[] = { +static int * const default_802_1q_settings_flags[] = { &hf_ieee1905_default_802_1q_settings_default_pcp, &hf_ieee1905_default_802_1q_settings_reserved, NULL @@ -5817,7 +5817,7 @@ dissect_packet_filtering_policy(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a Ethernet Configuration Policy TLV */ -static const int *interface_type_header[] = { +static int * const interface_type_header[] = { &hf_ieee1905_ethernet_config_policy_intf_type, &hf_ieee1905_ethernet_config_policy_reserved, NULL @@ -5947,7 +5947,7 @@ dissect_r2_error_code(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect an AP Operational Backhaul BSS TLV: */ -static const int *ap_operational_backhaul_bss_config[] = { +static int * const ap_operational_backhaul_bss_config[] = { &hf_ieee1905_r1_backhaul_association_disallowed, &hf_ieee1905_r2_above_backaul_association_dissallowed, &hf_ieee1905_ap_operational_backhaul_bss_reserved, @@ -6045,7 +6045,7 @@ dissect_ap_operational_backhaul_bss(tvbuff_t *tvb, packet_info *pinfo _U_, * Dissect an AP Radio Advanced Capabilities TLV */ -static const int *ap_radio_advanced_capa_flags[] = { +static int * const ap_radio_advanced_capa_flags[] = { &hf_ieee1905_ap_radio_advance_capa_backhaul_bss_traffic_sep, &hf_ieee1905_ap_radio_advance_capa_combined_r1_r2_backhaul, &hf_ieee1905_ap_radio_advance_capa_reserved, @@ -6181,7 +6181,7 @@ dissect_tunneled(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect an R2 Steering Request TLV: */ -static const int *r2_steering_flags[] = { +static int * const r2_steering_flags[] = { &hf_ieee1905_r2_steering_request_mode_flag, &hf_ieee1905_r2_btm_disassoc_imminent_flag, &hf_ieee1905_r2_btm_abridged_flag, @@ -6290,7 +6290,7 @@ static int dissect_unsuccessful_association_policy(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, guint16 len _U_) { - static const int *capabilities[] = { + static int * const capabilities[] = { &hf_ieee1905_rpt_unsuccessful_assoc_report, NULL, }; @@ -6396,7 +6396,7 @@ dissect_disassociation_reason_code(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a Backhaul STA Radio Capabilitoes TLV: */ -static const int *backhaul_sta_radio_capa_flags[] = { +static int * const backhaul_sta_radio_capa_flags[] = { &hf_ieee1905_backhaul_sta_radio_capa_mac_included, &hf_ieee1905_backhaul_sta_radio_capa_reserved, NULL @@ -6541,7 +6541,7 @@ dissect_akm_suite_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, /* * Dissect a 1905 Encap DPP TLV: */ -static const int *ieee1905_encap_dpp_flags[] = { +static int * const ieee1905_encap_dpp_flags[] = { &hf_ieee1905_dpp_encap_final_destination, &hf_ieee1905_dpp_encap_channel_list, &hf_ieee1905_dpp_encap_reserved, @@ -7158,7 +7158,7 @@ dissect_ieee1905(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *ieee1905_tree; guint16 message_type; guint offset = 0; - static const int *flag_headers[] = { + static int * const flag_headers[] = { &hf_ieee1905_last_fragment, &hf_ieee1905_relay_indicator, NULL diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index 78a52efc19..55f6c49ac3 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -833,7 +833,7 @@ static const true_false_string tfs_known_unknown = { "Unknown" }; -static const int *data1_headers[] = { +static int * const data1_headers[] = { &hf_radiotap_he_ppdu_format, &hf_radiotap_he_bss_color_known, &hf_radiotap_he_beam_change_known, @@ -860,7 +860,7 @@ static const value_string he_pdu_format_vals[] = { { 0, NULL } }; -static const int *data2_headers[] = { +static int * const data2_headers[] = { &hf_radiotap_he_pri_sec_80_mhz_known, &hf_radiotap_he_gi_known, &hf_radiotap_he_num_ltf_symbols_known, @@ -1149,19 +1149,11 @@ dissect_radiotap_he_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree info_11ax->has_mcs_index = TRUE; info_11ax->mcs = (data3 & IEEE80211_RADIOTAP_HE_DATA_MCS_MASK) >> 8; } - /* - * XXX - the cast is the result of the type of that argument not - * being what it should be. That should be fixed. - */ proto_tree_add_bitmask(he_info_tree, tvb, offset, hf_radiotap_he_info_data_3, ett_radiotap_he_info_data_3, - (const int **)data3_headers, ENC_LITTLE_ENDIAN); + data3_headers, ENC_LITTLE_ENDIAN); offset += 2; - /* - * XXX - the casts are the result of the type of that argument not - * being what it should be. That should be fixed. - */ if (ppdu_format == IEEE80211_RADIOTAP_HE_PPDU_FORMAT_HE_SU || ppdu_format == IEEE80211_RADIOTAP_HE_PPDU_FORMAT_HE_EXT_SU) { if (!spatial_reuse_1_known) @@ -1169,7 +1161,7 @@ dissect_radiotap_he_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree &hf_radiotap_spatial_reuse_unknown; proto_tree_add_bitmask(he_info_tree, tvb, offset, hf_radiotap_he_info_data_4, ett_radiotap_he_info_data_4, - (const int **)data4_he_su_and_he_ext_su_headers, ENC_LITTLE_ENDIAN); + data4_he_su_and_he_ext_su_headers, ENC_LITTLE_ENDIAN); } else if (ppdu_format == IEEE80211_RADIOTAP_HE_PPDU_FORMAT_HE_TRIG) { if (!spatial_reuse_1_known) data4_he_trig_headers[0] = @@ -1185,14 +1177,14 @@ dissect_radiotap_he_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree &hf_radiotap_spatial_reuse_4_unknown; proto_tree_add_bitmask(he_info_tree, tvb, offset, hf_radiotap_he_info_data_4, ett_radiotap_he_info_data_4, - (const int **)data4_he_trig_headers, ENC_LITTLE_ENDIAN); + data4_he_trig_headers, ENC_LITTLE_ENDIAN); } else { if (!spatial_reuse_1_known) data4_he_mu_headers[0] = &hf_radiotap_spatial_reuse_unknown; proto_tree_add_bitmask(he_info_tree, tvb, offset, hf_radiotap_he_info_data_4, ett_radiotap_he_info_data_4, - (const int **)data4_he_mu_headers, ENC_LITTLE_ENDIAN); + data4_he_mu_headers, ENC_LITTLE_ENDIAN); } //data4 = tvb_get_letohs(tvb, offset); @@ -1227,13 +1219,9 @@ dissect_radiotap_he_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree info_11ax->has_bwru = TRUE; info_11ax->bwru = (data5 & IEEE80211_RADIOTAP_HE_DATA_BANDWIDTH_RU_ALLOC_MASK); } - /* - * XXX - the cast is the result of the type of that argument not - * being what it should be. That should be fixed. - */ proto_tree_add_bitmask(he_info_tree, tvb, offset, hf_radiotap_he_info_data_5, ett_radiotap_he_info_data_5, - (const int **)data5_headers, ENC_LITTLE_ENDIAN); + data5_headers, ENC_LITTLE_ENDIAN); offset += 2; if (!doppler_known) @@ -1242,13 +1230,9 @@ dissect_radiotap_he_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree data6_headers[3] = &hf_radiotap_he_txop_value_unknown; if (!midamble_periodicity_known) data6_headers[4] = &hf_radiotap_midamble_periodicity_unknown; - /* - * XXX - the cast is the result of the type of that argument not - * being what it should be. That should be fixed. - */ proto_tree_add_bitmask(he_info_tree, tvb, offset, hf_radiotap_he_info_data_6, ett_radiotap_he_info_data_6, - (const int **)data6_headers, ENC_LITTLE_ENDIAN); + data6_headers, ENC_LITTLE_ENDIAN); data6 = tvb_get_letohs(tvb, offset); info_11ax->nsts = data6 & IEEE80211_RADIOTAP_HE_NSTS_MASK; @@ -1470,24 +1454,16 @@ dissect_radiotap_he_mu_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t he_mu_info_tree = proto_tree_add_subtree(tree, tvb, offset, 12, ett_radiotap_he_mu_info, NULL, "HE-MU information"); - /* - * XXX - the cast is the result of the type of that argument not - * being what it should be. That should be fixed. - */ proto_tree_add_bitmask(he_mu_info_tree, tvb, offset, hf_radiotap_he_mu_info_flags_1, ett_radiotap_he_mu_info_flags_1, - (const int **)flags1_headers, ENC_LITTLE_ENDIAN); + flags1_headers, ENC_LITTLE_ENDIAN); offset += 2; - /* - * XXX - the cast is the result of the type of that argument not - * being what it should be. That should be fixed. - */ proto_tree_add_bitmask(he_mu_info_tree, tvb, offset, hf_radiotap_he_mu_info_flags_2, ett_radiotap_he_mu_info_flags_2, - (const int **)flags2_headers, ENC_LITTLE_ENDIAN); + flags2_headers, ENC_LITTLE_ENDIAN); offset += 2; mu_chan1_rus = proto_tree_add_subtree(he_mu_info_tree, tvb, offset, 4, @@ -1568,14 +1544,14 @@ dissect_radiotap_0_length_psdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } } -static const int *l_sig_data1_headers[] = { +static int * const l_sig_data1_headers[] = { &hf_radiotap_l_sig_rate_known, &hf_radiotap_l_sig_length_known, &hf_radiotap_l_sig_reserved, NULL }; -static const int *l_sig_data2_headers[] = { +static int * const l_sig_data2_headers[] = { &hf_radiotap_l_sig_rate, &hf_radiotap_l_sig_length, NULL @@ -1836,7 +1812,7 @@ dissect_radiotap_channel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree if (tree) { gchar *chan_str; - static const int * channel_flags[] = { + static int * const channel_flags[] = { &hf_radiotap_channel_flags_turbo, &hf_radiotap_channel_flags_cck, &hf_radiotap_channel_flags_ofdm, @@ -1957,7 +1933,7 @@ dissect_radiotap_rx_flags(tvbuff_t *tvb, packet_info *pinfo _U_, *hdr_fcs_offset = offset; } } else { - static const int * rxflags[] = { + static int * const rxflags[] = { &hf_radiotap_rxflags_badplcp, NULL }; @@ -2093,7 +2069,7 @@ dissect_radiotap_xchannel(tvbuff_t *tvb, packet_info *pinfo _U_, phdr->has_channel = TRUE; phdr->channel = tvb_get_guint8(tvb, offset + 6); if (tree) { - static const int * xchannel_flags[] = { + static int * const xchannel_flags[] = { &hf_radiotap_xchannel_flags_turbo, &hf_radiotap_xchannel_flags_cck, &hf_radiotap_xchannel_flags_ofdm, @@ -2640,7 +2616,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u if (tree) { proto_item *it; - static const int * mcs_haves_with_ness_bit1[] = { + static int * const mcs_haves_with_ness_bit1[] = { &hf_radiotap_mcs_have_bw, &hf_radiotap_mcs_have_index, &hf_radiotap_mcs_have_gi, @@ -2651,7 +2627,7 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u &hf_radiotap_mcs_ness_bit1, NULL }; - static const int * mcs_haves_without_ness_bit1[] = { + static int * const mcs_haves_without_ness_bit1[] = { &hf_radiotap_mcs_have_bw, &hf_radiotap_mcs_have_index, &hf_radiotap_mcs_have_gi, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 6c98df2f26..ef8db42316 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -3626,7 +3626,7 @@ static int hf_ieee80211_ff_block_ack_params_policy = -1; static int hf_ieee80211_ff_block_ack_params_tid = -1; static int hf_ieee80211_ff_block_ack_params_buffer_size = -1; -static const int *ieee80211_ff_block_ack_params_fields[] = { +static int * const ieee80211_ff_block_ack_params_fields[] = { &hf_ieee80211_ff_block_ack_params_amsdu_permitted, &hf_ieee80211_ff_block_ack_params_policy, &hf_ieee80211_ff_block_ack_params_tid, @@ -3640,7 +3640,7 @@ static int hf_ieee80211_ff_block_ack_ssc = -1; static int hf_ieee80211_ff_block_ack_ssc_fragment = -1; static int hf_ieee80211_ff_block_ack_ssc_sequence = -1; -static const int *ieee80211_ff_block_ack_ssc_fields[] = { +static int * const ieee80211_ff_block_ack_ssc_fields[] = { &hf_ieee80211_ff_block_ack_ssc_fragment, &hf_ieee80211_ff_block_ack_ssc_sequence, NULL @@ -3651,7 +3651,7 @@ static int hf_ieee80211_ff_delba_param_reserved = -1; static int hf_ieee80211_ff_delba_param_init = -1; static int hf_ieee80211_ff_delba_param_tid = -1; -static const int *ieee80211_ff_delba_param_fields[] = { +static int * const ieee80211_ff_delba_param_fields[] = { &hf_ieee80211_ff_delba_param_reserved, &hf_ieee80211_ff_delba_param_init, &hf_ieee80211_ff_delba_param_tid, @@ -3673,7 +3673,7 @@ static int hf_ieee80211_ff_qos_info_ap_queue_req = -1; static int hf_ieee80211_ff_qos_info_ap_txop_request = -1; static int hf_ieee80211_ff_qos_info_ap_more_data_ack = -1; -static const int *ieee80211_ff_qos_info_ap_fields[] = { +static int * const ieee80211_ff_qos_info_ap_fields[] = { &hf_ieee80211_ff_qos_info_ap_edca_param_set_counter, &hf_ieee80211_ff_qos_info_ap_q_ack, &hf_ieee80211_ff_qos_info_ap_queue_req, @@ -3691,7 +3691,7 @@ static int hf_ieee80211_ff_qos_info_sta_q_ack = -1; static int hf_ieee80211_ff_qos_info_sta_max_sp_length = -1; static int hf_ieee80211_ff_qos_info_sta_more_data_ack = -1; -static const int *ieee80211_ff_qos_info_sta_fields[] = { +static int * const ieee80211_ff_qos_info_sta_fields[] = { &hf_ieee80211_ff_qos_info_sta_ac_vo, &hf_ieee80211_ff_qos_info_sta_ac_vi, &hf_ieee80211_ff_qos_info_sta_ac_bk, @@ -3707,7 +3707,7 @@ static int hf_ieee80211_ff_sm_pwr_save_enabled = -1; static int hf_ieee80211_ff_sm_pwr_save_sm_mode = -1; static int hf_ieee80211_ff_sm_pwr_save_reserved = -1; -static const int *ieee80211_ff_sw_pwr_save_fields[] = { +static int * const ieee80211_ff_sw_pwr_save_fields[] = { &hf_ieee80211_ff_sm_pwr_save_enabled, &hf_ieee80211_ff_sm_pwr_save_sm_mode, &hf_ieee80211_ff_sm_pwr_save_reserved, @@ -3721,7 +3721,7 @@ static int hf_ieee80211_ff_psmp_param_set_n_sta = -1; static int hf_ieee80211_ff_psmp_param_set_more_psmp = -1; static int hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration = -1; -static const int *ieee80211_ff_psmp_param_set_fields[] = { +static int * const ieee80211_ff_psmp_param_set_fields[] = { &hf_ieee80211_ff_psmp_param_set_n_sta, &hf_ieee80211_ff_psmp_param_set_more_psmp, &hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration, @@ -3769,7 +3769,7 @@ static int hf_ieee80211_ff_ant_selection_5 = -1; static int hf_ieee80211_ff_ant_selection_6 = -1; static int hf_ieee80211_ff_ant_selection_7 = -1; -static const int *ieee80211_ff_ant_selection_fields[] = { +static int * const ieee80211_ff_ant_selection_fields[] = { &hf_ieee80211_ff_ant_selection_0, &hf_ieee80211_ff_ant_selection_1, &hf_ieee80211_ff_ant_selection_2, @@ -3787,7 +3787,7 @@ static int hf_ieee80211_ff_ext_channel_switch_announcement_new_ope_class = -1; static int hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number = -1; static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_count = -1; -static const int *ieee80211_ff_ext_channel_switch_announcement_fields[] = { +static int * const ieee80211_ff_ext_channel_switch_announcement_fields[] = { &hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode, &hf_ieee80211_ff_ext_channel_switch_announcement_new_ope_class, &hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number, @@ -3801,7 +3801,7 @@ static int hf_ieee80211_ff_ht_info_40_mhz_intolerant = -1; static int hf_ieee80211_ff_ht_info_sta_chan_width = -1; static int hf_ieee80211_ff_ht_info_reserved = -1; -static const int *ieee80211_ff_ht_info_fields[] = { +static int * const ieee80211_ff_ht_info_fields[] = { &hf_ieee80211_ff_ht_info_information_request, &hf_ieee80211_ff_ht_info_40_mhz_intolerant, &hf_ieee80211_ff_ht_info_sta_chan_width, @@ -4552,7 +4552,7 @@ static int hf_ieee80211_ff_vht_mimo_cntrl_first_feedback_seg = -1; static int hf_ieee80211_ff_vht_mimo_cntrl_reserved = -1; static int hf_ieee80211_ff_vht_mimo_cntrl_sounding_dialog_token_number = -1; -static const int *hf_ieee80211_ff_vht_mimo_cntrl_fields[] = { +static int * const hf_ieee80211_ff_vht_mimo_cntrl_fields[] = { &hf_ieee80211_ff_vht_mimo_cntrl_nc_index, &hf_ieee80211_ff_vht_mimo_cntrl_nr_index, &hf_ieee80211_ff_vht_mimo_cntrl_channel_width, @@ -5091,7 +5091,7 @@ static int hf_ieee80211_tsinfo_ack = -1; static int hf_ieee80211_tsinfo_sched = -1; static int hf_ieee80211_tsinfo_rsv = -1; -static const int *ieee80211_tsinfo_fields[] = { +static int * const ieee80211_tsinfo_fields[] = { &hf_ieee80211_tsinfo_type, &hf_ieee80211_tsinfo_tsid, &hf_ieee80211_tsinfo_dir, @@ -5371,7 +5371,7 @@ static int hf_ieee80211_ff_bic_abft_count = -1; static int hf_ieee80211_ff_bic_nabft = -1; static int hf_ieee80211_ff_bic_pcp = -1; static int hf_ieee80211_ff_bic_reserved = -1; -static const int *ieee80211_ff_bic_fields[] = { +static int * const ieee80211_ff_bic_fields[] = { &hf_ieee80211_ff_bic_cc_present, &hf_ieee80211_ff_bic_discovery_mode, &hf_ieee80211_ff_bic_next_beacon, @@ -9129,7 +9129,7 @@ add_ff_dmg_params(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int o static guint add_ff_cap_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ap_fields[] = { + static int * const ieee80211_ap_fields[] = { &hf_ieee80211_ff_cf_ess, &hf_ieee80211_ff_cf_ibss, &hf_ieee80211_ff_cf_ap_poll, @@ -9147,7 +9147,7 @@ add_ff_cap_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int off NULL }; - static const int *ieee80211_sta_fields[] = { + static int * const ieee80211_sta_fields[] = { &hf_ieee80211_ff_cf_ess, &hf_ieee80211_ff_cf_ibss, &hf_ieee80211_ff_cf_sta_poll, @@ -9312,7 +9312,7 @@ dissect_ftm_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void int offset = 0; int len = 0; proto_tree *ftm_param_tree = tree; - static const int *ieee80211_ftm_params_fields1[] = { + static int * const ieee80211_ftm_params_fields1[] = { &hf_ieee80211_ff_ftm_param_status_indication, &hf_ieee80211_ff_ftm_param_value, &hf_ieee80211_ff_ftm_param_reserved1, @@ -9320,7 +9320,7 @@ dissect_ftm_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void &hf_ieee80211_ff_ftm_param_burst_duration, NULL}; - static const int *ieee80211_ftm_params_fields2[] = { + static int * const ieee80211_ftm_params_fields2[] = { &hf_ieee80211_ff_ftm_param_min_delta_ftm, &hf_ieee80211_ff_ftm_param_partial_tsf_timer, &hf_ieee80211_ff_ftm_param_partial_tsf_no_pref, @@ -9329,7 +9329,7 @@ dissect_ftm_params(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void &hf_ieee80211_ff_ftm_param_ftm_per_burst, NULL}; - static const int *ieee80211_ftm_params_fields3[] = { + static int * const ieee80211_ftm_params_fields3[] = { &hf_ieee80211_ff_ftm_param_reserved2, &hf_ieee80211_ff_ftm_param_format_and_bw, &hf_ieee80211_ff_ftm_param_burst_period, @@ -9713,7 +9713,7 @@ add_ff_mimo_cntrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int o { proto_item *mimo_item; proto_tree *mimo_tree; - static const int *ieee80211_mimo_fields[] = { + static int * const ieee80211_mimo_fields[] = { &hf_ieee80211_ff_mimo_cntrl_nc_index, &hf_ieee80211_ff_mimo_cntrl_nr_index, &hf_ieee80211_ff_mimo_cntrl_channel_width, @@ -9859,11 +9859,11 @@ add_ff_psmp_sta_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, in static guint add_ff_schedule_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_schedule_info_fields1[] = { + static int * const ieee80211_schedule_info_fields1[] = { &hf_ieee80211_sched_info_agg, NULL }; - static const int *ieee80211_schedule_info_fields2[] = { + static int * const ieee80211_schedule_info_fields2[] = { &hf_ieee80211_sched_info_agg, &hf_ieee80211_sched_info_tsid, &hf_ieee80211_sched_info_dir, @@ -10894,7 +10894,7 @@ wnm_bss_trans_mgmt_req(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int int tmp_sublen; const guint8 ids[] = { TAG_NEIGHBOR_REPORT, TAG_VENDOR_SPECIFIC_IE}; - static const int *ieee80211_ff_request_flags[] = { + static int * const ieee80211_ff_request_flags[] = { &hf_ieee80211_ff_request_mode_pref_cand, &hf_ieee80211_ff_request_mode_abridged, &hf_ieee80211_ff_request_mode_disassoc_imminent, @@ -11394,7 +11394,7 @@ add_ff_beamforming_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint16 bf_field = tvb_get_letohs(tvb, offset); gboolean isInit = (bf_field & 0x2) >> 1; gboolean isResp = (bf_field & 0x4) >> 2; - static const int *ieee80211_ff_beamforming_ctrl[] = { + static int * const ieee80211_ff_beamforming_ctrl[] = { &hf_ieee80211_ff_bf_train, &hf_ieee80211_ff_bf_is_init, &hf_ieee80211_ff_bf_is_resp, @@ -11404,7 +11404,7 @@ add_ff_beamforming_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, NULL }; - static const int *ieee80211_ff_beamforming_ctrl_grant[] = { + static int * const ieee80211_ff_beamforming_ctrl_grant[] = { &hf_ieee80211_ff_bf_train, &hf_ieee80211_ff_bf_is_init, &hf_ieee80211_ff_bf_is_resp, @@ -11429,7 +11429,7 @@ add_ff_beamforming_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, static guint add_ff_dynamic_allocation(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_dynamic_allocation[] = { + static int * const ieee80211_ff_dynamic_allocation[] = { &hf_ieee80211_ff_TID, &hf_ieee80211_ff_alloc_type, &hf_ieee80211_ff_src_aid, @@ -11449,7 +11449,7 @@ add_ff_dynamic_allocation(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U static guint add_ff_beamformed_link(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_beamformed_link[] = { + static int * const ieee80211_ff_beamformed_link[] = { &hf_ieee80211_ff_blm_unit_index, &hf_ieee80211_ff_blm_maint_value, &hf_ieee80211_ff_blm_is_master, @@ -11465,7 +11465,7 @@ add_ff_beamformed_link(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, static guint add_ff_BRP_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_BRP_request[] = { + static int * const ieee80211_ff_BRP_request[] = { &hf_ieee80211_ff_brp_L_RX, &hf_ieee80211_ff_brp_TX_TRN_REQ, &hf_ieee80211_ff_brp_MID_REQ, @@ -11489,7 +11489,7 @@ add_ff_BRP_request(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int static guint add_ff_sector_sweep_feedback_from_iss(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_sector_sweep_feedback_from_iss[] = { + static int * const ieee80211_ff_sector_sweep_feedback_from_iss[] = { &hf_ieee80211_ff_sswf_total_sectors, &hf_ieee80211_ff_sswf_num_rx_dmg_ants, &hf_ieee80211_ff_sswf_reserved1, @@ -11507,7 +11507,7 @@ add_ff_sector_sweep_feedback_from_iss(proto_tree *tree, tvbuff_t *tvb, packet_in static guint add_ff_sector_sweep_feedback_to_iss(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_sector_sweep_feedback_to_iss[] = { + static int * const ieee80211_ff_sector_sweep_feedback_to_iss[] = { &hf_ieee80211_ff_sswf_sector_select, &hf_ieee80211_ff_sswf_dmg_antenna_select, &hf_ieee80211_ff_sswf_snr_report, @@ -11525,7 +11525,7 @@ add_ff_sector_sweep_feedback_to_iss(proto_tree *tree, tvbuff_t *tvb, packet_info static guint add_ff_sector_sweep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_sector_sweep[] = { + static int * const ieee80211_ff_sector_sweep[] = { &hf_ieee80211_ff_ssw_direction, &hf_ieee80211_ff_ssw_cdown, &hf_ieee80211_ff_ssw_sector_id, @@ -11543,7 +11543,7 @@ add_ff_sector_sweep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int static guint add_ff_dmg_params(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int offset) { - static const int *ieee80211_ff_dmg_params[] = { + static int * const ieee80211_ff_dmg_params[] = { &hf_ieee80211_ff_dmg_params_bss, &hf_ieee80211_ff_dmg_params_cbap_only, &hf_ieee80211_ff_dmg_params_cbap_src, @@ -11712,7 +11712,7 @@ add_tag_relay_capabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_tag_relay_capabilities[] = { + static int * const ieee80211_tag_relay_capabilities[] = { &hf_ieee80211_tag_relay_support, &hf_ieee80211_tag_relay_use, &hf_ieee80211_tag_relay_permission, @@ -12378,12 +12378,12 @@ static guint add_ff_s1g_twt_teardown(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset) { guint8 twt_flow_id = tvb_get_guint8(tvb, offset); - static const int *ieee80211_twt_individual_flow[] = { + static int * const ieee80211_twt_individual_flow[] = { &hf_ieee80211_twt_individual_flow_id, &hf_ieee80211_twt_neg_type, NULL, }; - static const int *ieee80211_twt_bcast_flow[] = { + static int * const ieee80211_twt_bcast_flow[] = { &hf_ieee80211_twt_bcast_id, &hf_ieee80211_twt_neg_type, NULL, @@ -12868,7 +12868,7 @@ dissect_he_feedback_matrix(proto_tree *tree, tvbuff_t *tvb, int offset, return bit_offset; } -static const int *he_mimo_control_headers[] = { +static int * const he_mimo_control_headers[] = { &hf_ieee80211_he_mimo_control_nc_index, &hf_ieee80211_he_mimo_control_nr_index, &hf_ieee80211_he_mimo_control_bw, @@ -13753,7 +13753,7 @@ dissect_wme_qos_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of { proto_item *wme_qos_info_item; - static const int *ieee80211_mgt_req[] = { + static int * const ieee80211_mgt_req[] = { &hf_ieee80211_wfa_ie_wme_qos_info_sta_max_sp_length, &hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_be, &hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_bk, @@ -13763,7 +13763,7 @@ dissect_wme_qos_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of NULL }; - static const int *ieee80211_mgt_resp[] = { + static int * const ieee80211_mgt_resp[] = { &hf_ieee80211_wfa_ie_wme_qos_info_ap_u_apsd, &hf_ieee80211_wfa_ie_wme_qos_info_ap_parameter_set_count, &hf_ieee80211_wfa_ie_wme_qos_info_ap_reserved, @@ -13817,7 +13817,7 @@ decode_qos_parameter_set(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in proto_tree *ac_tree, *ecw_tree; guint8 aci_aifsn, ecw, ecwmin, ecwmax; guint16 cwmin, cwmax; - static const int *ieee80211_wfa_ie_wme[] = { + static int * const ieee80211_wfa_ie_wme[] = { &hf_ieee80211_wfa_ie_wme_acp_aifsn, &hf_ieee80211_wfa_ie_wme_acp_acm, &hf_ieee80211_wfa_ie_wme_acp_aci, @@ -13979,7 +13979,7 @@ dissect_vendor_ie_wpawme(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, in } case 2: /* WME TSPEC Element */ { - static const int *ieee80211_wfa_ie_wme_tspec_tsinfo[] = { + static int * const ieee80211_wfa_ie_wme_tspec_tsinfo[] = { &hf_ieee80211_wfa_ie_wme_tspec_tsinfo_tid, &hf_ieee80211_wfa_ie_wme_tspec_tsinfo_direction, &hf_ieee80211_wfa_ie_wme_tspec_tsinfo_psb, @@ -14095,7 +14095,7 @@ dissect_hs20_osen(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* proto_item *pwcsi = NULL; guint16 pwc_count = 0, pwc_index = 0; guint16 akms_count = 0, akms_index = 0; - static const int *osen_rsn_cap[] = { + static int * const osen_rsn_cap[] = { &hf_ieee80211_osen_rsn_cap_preauth, &hf_ieee80211_osen_rsn_cap_no_pairwise, &hf_ieee80211_osen_rsn_cap_ptksa_replay_counter, @@ -14247,7 +14247,7 @@ static const value_string hs20_indication_release_number_vals[] = { static int dissect_hs20_indication(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - static const int *ieee80211_hs20_indication[] = { + static int * const ieee80211_hs20_indication[] = { &hf_ieee80211_hs20_indication_dgaf_disabled, &hf_ieee80211_hs20_indication_pps_mo_id_present, &hf_ieee80211_hs20_indication_anqp_domain_id_present, @@ -14780,7 +14780,7 @@ static const value_string atheros_ie_type_vals[] = { { 0, NULL } }; -static const int *ieee80211_atheros_ie_cap[] = { +static int * const ieee80211_atheros_ie_cap[] = { &hf_ieee80211_atheros_ie_cap_f_turbop, &hf_ieee80211_atheros_ie_cap_f_comp, &hf_ieee80211_atheros_ie_cap_f_ff, @@ -15444,7 +15444,7 @@ dissect_rsn_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, guint16 pcs_count, akms_count, pmkid_count; guint ii; int tag_end = offset + tag_len; - static const int *ieee80211_rsn_cap[] = { + static int * const ieee80211_rsn_cap[] = { &hf_ieee80211_rsn_cap_preauth, &hf_ieee80211_rsn_cap_no_pairwise, &hf_ieee80211_rsn_cap_ptksa_replay_counter, @@ -15630,7 +15630,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; proto_item *ti_ex_cap; - static const int *ieee80211_tag_extended_capabilities_byte1[] = { + static int * const ieee80211_tag_extended_capabilities_byte1[] = { &hf_ieee80211_tag_extended_capabilities_b0, &hf_ieee80211_tag_extended_capabilities_b1, &hf_ieee80211_tag_extended_capabilities_b2, @@ -15641,7 +15641,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * &hf_ieee80211_tag_extended_capabilities_b7, NULL }; - static const int *ieee80211_tag_extended_capabilities_byte2[] = { + static int * const ieee80211_tag_extended_capabilities_byte2[] = { &hf_ieee80211_tag_extended_capabilities_b8, &hf_ieee80211_tag_extended_capabilities_b9, &hf_ieee80211_tag_extended_capabilities_b10, @@ -15652,7 +15652,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * &hf_ieee80211_tag_extended_capabilities_b15, NULL }; - static const int *ieee80211_tag_extended_capabilities_byte3[] = { + static int * const ieee80211_tag_extended_capabilities_byte3[] = { &hf_ieee80211_tag_extended_capabilities_b16, &hf_ieee80211_tag_extended_capabilities_b17, &hf_ieee80211_tag_extended_capabilities_b18, @@ -15663,7 +15663,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * &hf_ieee80211_tag_extended_capabilities_b23, NULL }; - static const int *ieee80211_tag_extended_capabilities_byte4[] = { + static int * const ieee80211_tag_extended_capabilities_byte4[] = { &hf_ieee80211_tag_extended_capabilities_b24, &hf_ieee80211_tag_extended_capabilities_b25, &hf_ieee80211_tag_extended_capabilities_b26, @@ -15674,7 +15674,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * &hf_ieee80211_tag_extended_capabilities_b31, NULL }; - static const int *ieee80211_tag_extended_capabilities_byte5[] = { + static int * const ieee80211_tag_extended_capabilities_byte5[] = { &hf_ieee80211_tag_extended_capabilities_b32, &hf_ieee80211_tag_extended_capabilities_b33, &hf_ieee80211_tag_extended_capabilities_b34, @@ -15685,7 +15685,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * &hf_ieee80211_tag_extended_capabilities_b39, NULL }; - static const int *ieee80211_tag_extended_capabilities_byte6[] = { + static int * const ieee80211_tag_extended_capabilities_byte6[] = { &hf_ieee80211_tag_extended_capabilities_b40, &hf_ieee80211_tag_extended_capabilities_serv_int_granularity, &hf_ieee80211_tag_extended_capabilities_b44, @@ -15694,7 +15694,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * &hf_ieee80211_tag_extended_capabilities_b47, NULL }; - static const int *ieee80211_tag_extended_capabilities_byte7[] = { + static int * const ieee80211_tag_extended_capabilities_byte7[] = { &hf_ieee80211_tag_extended_capabilities_b48, &hf_ieee80211_tag_extended_capabilities_b49, &hf_ieee80211_tag_extended_capabilities_b50, @@ -15706,7 +15706,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * NULL }; - static const int *ieee80211_tag_extended_capabilities_byte8[] = { + static int * const ieee80211_tag_extended_capabilities_byte8[] = { &hf_ieee80211_tag_extended_capabilities_b56, &hf_ieee80211_tag_extended_capabilities_b57, &hf_ieee80211_tag_extended_capabilities_b58, @@ -15718,7 +15718,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * NULL }; - static const int *ieee80211_tag_extended_capabilities_bytes89[] = { + static int * const ieee80211_tag_extended_capabilities_bytes89[] = { &hf_ieee80211_tag_extended_capabilities_b56_2, &hf_ieee80211_tag_extended_capabilities_b57_2, &hf_ieee80211_tag_extended_capabilities_b58_2, @@ -15737,7 +15737,7 @@ dissect_extended_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree * NULL }; - static const int *ieee80211_tag_extended_capabilities_byte10[] = { + static int * const ieee80211_tag_extended_capabilities_byte10[] = { &hf_ieee80211_tag_extended_capabilities_b72, &hf_ieee80211_tag_extended_capabilities_b73, &hf_ieee80211_tag_extended_capabilities_b74, @@ -15863,7 +15863,7 @@ dissect_vht_mcs_set(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_item *ti; proto_tree *mcs_tree; - static const int *ieee80211_vht_mcsset_rx_max_mcs[] = { + static int * const ieee80211_vht_mcsset_rx_max_mcs[] = { &hf_ieee80211_vht_mcsset_rx_max_mcs_for_1_ss, &hf_ieee80211_vht_mcsset_rx_max_mcs_for_2_ss, &hf_ieee80211_vht_mcsset_rx_max_mcs_for_3_ss, @@ -15874,7 +15874,7 @@ dissect_vht_mcs_set(proto_tree *tree, tvbuff_t *tvb, int offset) &hf_ieee80211_vht_mcsset_rx_max_mcs_for_8_ss, NULL }; - static const int *ieee80211_vht_mcsset_tx_max_mcs[] = { + static int * const ieee80211_vht_mcsset_tx_max_mcs[] = { &hf_ieee80211_vht_mcsset_tx_max_mcs_for_1_ss, &hf_ieee80211_vht_mcsset_tx_max_mcs_for_2_ss, &hf_ieee80211_vht_mcsset_tx_max_mcs_for_3_ss, @@ -15930,7 +15930,7 @@ dissect_vht_capability_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_vht_caps[] = { + static int * const ieee80211_vht_caps[] = { &hf_ieee80211_vht_max_mpdu_length, &hf_ieee80211_vht_supported_chan_width_set, &hf_ieee80211_vht_rx_ldpc, @@ -15982,7 +15982,7 @@ dissect_vht_operation_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo int offset = 0; proto_item *op_item; proto_tree *op_tree; - static const int *ieee80211_vht_op_max_basic_mcs[] = { + static int * const ieee80211_vht_op_max_basic_mcs[] = { &hf_ieee80211_vht_op_max_basic_mcs_for_1_ss, &hf_ieee80211_vht_op_max_basic_mcs_for_2_ss, &hf_ieee80211_vht_op_max_basic_mcs_for_3_ss, @@ -16506,7 +16506,7 @@ dissect_pu_buffer_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_pu_buffer_status[] = { + static int * const ieee80211_pu_buffer_status[] = { &hf_ieee80211_tag_pu_buffer_status_ac_bk, &hf_ieee80211_tag_pu_buffer_status_ac_be, &hf_ieee80211_tag_pu_buffer_status_ac_vi, @@ -16747,7 +16747,7 @@ static int dissect_operating_mode_notification(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { int offset = 0; - static const int *ieee80211_operat_mode_field[] = { + static int * const ieee80211_operat_mode_field[] = { &hf_ieee80211_operat_mode_field_channel_width, &hf_ieee80211_operat_mode_field_reserved, &hf_ieee80211_operat_mode_field_rxnss, @@ -16915,7 +16915,7 @@ dissect_ht_info_ie_1_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_ht_info1_field[] = { + static int * const ieee80211_ht_info1_field[] = { &hf_ieee80211_ht_info_secondary_channel_offset, &hf_ieee80211_ht_info_sta_channel_width, &hf_ieee80211_ht_info_rifs_mode, @@ -16923,7 +16923,7 @@ dissect_ht_info_ie_1_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void NULL }; - static const int *ieee80211_ht_info2_field[] = { + static int * const ieee80211_ht_info2_field[] = { &hf_ieee80211_ht_info_protection, &hf_ieee80211_ht_info_non_greenfield_sta_present, &hf_ieee80211_ht_info_reserved_b11, @@ -16933,7 +16933,7 @@ dissect_ht_info_ie_1_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void NULL }; - static const int *ieee80211_ht_info3_field[] = { + static int * const ieee80211_ht_info3_field[] = { &hf_ieee80211_ht_info_reserved_b24_b29, &hf_ieee80211_ht_info_dual_beacon, &hf_ieee80211_ht_info_dual_cts_protection, @@ -16985,7 +16985,7 @@ dissect_wapi_param_set(tvbuff_t *tvb, packet_info *pinfo, proto_tree *subtree; guint16 loop_cnt, version, akm_cnt = 1, ucast_cnt = 1, bkid_cnt = 1; guint8 akm_suite_type = 0, ucast_cipher_type = 0, mcast_cipher_type = 0; - static const int *ieee80211_tag_wapi_param_set[] = { + static int * const ieee80211_tag_wapi_param_set[] = { &hf_ieee80211_tag_wapi_param_set_capab_preauth, &hf_ieee80211_tag_wapi_param_set_capab_rsvd, NULL @@ -17566,7 +17566,7 @@ dissect_bss_available_admission_capacity_ie(tvbuff_t *tvb, packet_info *pinfo, p ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; guint16 bitmask; - static const int *ieee80211_tag_bss_avb_adm_cap_bitmask[] = { + static int * const ieee80211_tag_bss_avb_adm_cap_bitmask[] = { &hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up0, &hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up1, &hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up2, @@ -17693,7 +17693,7 @@ dissect_rm_enabled_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; proto_item *ti_ex_cap; - static const int *ieee80211_tag_rm_enabled_capabilities_octet1[] = { + static int * const ieee80211_tag_rm_enabled_capabilities_octet1[] = { &hf_ieee80211_tag_rm_enabled_capabilities_b0, &hf_ieee80211_tag_rm_enabled_capabilities_b1, &hf_ieee80211_tag_rm_enabled_capabilities_b2, @@ -17705,7 +17705,7 @@ dissect_rm_enabled_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree NULL }; - static const int *ieee80211_tag_rm_enabled_capabilities_octet2[] = { + static int * const ieee80211_tag_rm_enabled_capabilities_octet2[] = { &hf_ieee80211_tag_rm_enabled_capabilities_b8, &hf_ieee80211_tag_rm_enabled_capabilities_b9, &hf_ieee80211_tag_rm_enabled_capabilities_b10, @@ -17717,7 +17717,7 @@ dissect_rm_enabled_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree NULL }; - static const int *ieee80211_tag_rm_enabled_capabilities_octet3[] = { + static int * const ieee80211_tag_rm_enabled_capabilities_octet3[] = { &hf_ieee80211_tag_rm_enabled_capabilities_b16, &hf_ieee80211_tag_rm_enabled_capabilities_b17, &hf_ieee80211_tag_rm_enabled_capabilities_b18to20, @@ -17725,7 +17725,7 @@ dissect_rm_enabled_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree NULL }; - static const int *ieee80211_tag_rm_enabled_capabilities_octet4[] = { + static int * const ieee80211_tag_rm_enabled_capabilities_octet4[] = { &hf_ieee80211_tag_rm_enabled_capabilities_b24to26, &hf_ieee80211_tag_rm_enabled_capabilities_b27, &hf_ieee80211_tag_rm_enabled_capabilities_b28, @@ -17735,7 +17735,7 @@ dissect_rm_enabled_capabilities_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree NULL }; - static const int *ieee80211_tag_rm_enabled_capabilities_octet5[] = { + static int * const ieee80211_tag_rm_enabled_capabilities_octet5[] = { &hf_ieee80211_tag_rm_enabled_capabilities_b32, &hf_ieee80211_tag_rm_enabled_capabilities_b33, &hf_ieee80211_tag_rm_enabled_capabilities_o5, @@ -17877,7 +17877,7 @@ dissect_20_40_bss_coexistence(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_20_40_bss_coexistence_fields[] = { + static int * const ieee80211_20_40_bss_coexistence_fields[] = { &hf_ieee80211_tag_20_40_bc_information_request, &hf_ieee80211_tag_20_40_bc_forty_mhz_intolerant, &hf_ieee80211_tag_20_40_bc_20_mhz_bss_witdh_request, @@ -17908,7 +17908,7 @@ dissect_ht_capability_ie_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { proto_item *cap_item, *ti; proto_tree *cap_tree; - static const int *ieee80211_ht[] = { + static int * const ieee80211_ht[] = { &hf_ieee80211_ht_ldpc_coding, &hf_ieee80211_ht_chan_width, &hf_ieee80211_ht_sm_pwsave, @@ -17926,7 +17926,7 @@ dissect_ht_capability_ie_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t NULL }; - static const int *ieee80211_htex[] = { + static int * const ieee80211_htex[] = { &hf_ieee80211_htex_pco, &hf_ieee80211_htex_transtime, &hf_ieee80211_htex_mcs, @@ -17935,7 +17935,7 @@ dissect_ht_capability_ie_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t NULL }; - static const int *ieee80211_txbf[] = { + static int * const ieee80211_txbf[] = { &hf_ieee80211_txbf_cap, &hf_ieee80211_txbf_rcv_ssc, &hf_ieee80211_txbf_tx_ssc, @@ -17959,7 +17959,7 @@ dissect_ht_capability_ie_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t NULL }; - static const int *ieee80211_antsel[] = { + static int * const ieee80211_antsel[] = { &hf_ieee80211_antsel_b0, &hf_ieee80211_antsel_b1, &hf_ieee80211_antsel_b2, @@ -18072,7 +18072,7 @@ static int dissect_ht_info_ie_1_0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, guint32 tag_len, proto_item *ti_len) { - static const int *ieee80211_hta1[] = { + static int * const ieee80211_hta1[] = { &hf_ieee80211_hta_ext_chan_offset, &hf_ieee80211_hta_rec_tx_width, &hf_ieee80211_hta_rifs_mode, @@ -18081,13 +18081,13 @@ dissect_ht_info_ie_1_0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int NULL }; - static const int *ieee80211_hta2[] = { + static int * const ieee80211_hta2[] = { &hf_ieee80211_hta_operating_mode, &hf_ieee80211_hta_non_gf_devices, NULL }; - static const int *ieee80211_hta3[] = { + static int * const ieee80211_hta3[] = { &hf_ieee80211_hta_basic_stbc_mcs, &hf_ieee80211_hta_dual_stbc_protection, &hf_ieee80211_hta_secondary_beacon, @@ -18720,7 +18720,7 @@ dissect_interworking(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_tag_interworking[] = { + static int * const ieee80211_tag_interworking[] = { &hf_ieee80211_tag_interworking_access_network_type, &hf_ieee80211_tag_interworking_internet, &hf_ieee80211_tag_interworking_asra, @@ -19291,7 +19291,7 @@ ieee80211_tag_tim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; guint aid, pvb_len, n1, i, j, byte; - static const int *ieee80211_tim_bmapctl[] = { + static int * const ieee80211_tim_bmapctl[] = { &hf_ieee80211_tim_bmapctl_mcast, &hf_ieee80211_tim_bmapctl_offset, NULL @@ -19772,14 +19772,14 @@ ieee80211_tag_tclas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d int offset = 0; guint8 type; guint8 version; - static const int *ieee80211_tclas_class_mask0[] = { + static int * const ieee80211_tclas_class_mask0[] = { &hf_ieee80211_tclas_class_mask0_src_addr, &hf_ieee80211_tclas_class_mask0_dst_addr, &hf_ieee80211_tclas_class_mask0_type, NULL }; - static const int *ieee80211_tclas_class_mask1[] = { + static int * const ieee80211_tclas_class_mask1[] = { &hf_ieee80211_tclas_class_mask1_ver, &hf_ieee80211_tclas_class_mask1_src_ip, &hf_ieee80211_tclas_class_mask1_dst_ip, @@ -19789,7 +19789,7 @@ ieee80211_tag_tclas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d NULL }; - static const int *ieee80211_tclas_class_mask1_4[] = { + static int * const ieee80211_tclas_class_mask1_4[] = { &hf_ieee80211_tclas_class_mask1_ver, &hf_ieee80211_tclas_class_mask1_src_ip, &hf_ieee80211_tclas_class_mask1_dst_ip, @@ -19800,7 +19800,7 @@ ieee80211_tag_tclas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d NULL }; - static const int *ieee80211_tclas_class_mask2[] = { + static int * const ieee80211_tclas_class_mask2[] = { &hf_ieee80211_tclas_class_mask2_tci, NULL }; @@ -20087,7 +20087,7 @@ ieee80211_tag_measure_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v guint8 request_type; proto_item *parent_item; proto_tree *sub_tree; - static const int *ieee80211_tag_measure_request_mode[] = { + static int * const ieee80211_tag_measure_request_mode[] = { &hf_ieee80211_tag_measure_request_mode_parallel, &hf_ieee80211_tag_measure_request_mode_enable, &hf_ieee80211_tag_measure_request_mode_request, @@ -20394,14 +20394,14 @@ ieee80211_tag_measure_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_item *parent_item; proto_tree *sub_tree; guint8 report_type; - static const int *ieee80211_tag_measure_report_mode[] = { + static int * const ieee80211_tag_measure_report_mode[] = { &hf_ieee80211_tag_measure_report_mode_late, &hf_ieee80211_tag_measure_report_mode_incapable, &hf_ieee80211_tag_measure_report_mode_refused, &hf_ieee80211_tag_measure_report_mode_reserved, NULL }; - static const int *ieee80211_tag_measure_map_field[] = { + static int * const ieee80211_tag_measure_map_field[] = { &hf_ieee80211_tag_measure_map_field_bss, &hf_ieee80211_tag_measure_map_field_ofdm, &hf_ieee80211_tag_measure_map_field_unident_signal, @@ -20410,7 +20410,7 @@ ieee80211_tag_measure_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v &hf_ieee80211_tag_measure_map_field_reserved, NULL }; - static const int *ieee80211_tag_measure_report_frame_info[] = { + static int * const ieee80211_tag_measure_report_frame_info[] = { &hf_ieee80211_tag_measure_report_frame_info_phy_type, &hf_ieee80211_tag_measure_report_frame_info_frame_type, NULL @@ -20669,7 +20669,7 @@ ieee80211_tag_measure_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } case MEASURE_REP_BEACON_SUB_REPORTED_FRAME_BODY_FRAG_ID: { - static const int *ieee80211_tag_measure_reported_frame_frag_id[] = { + static int * const ieee80211_tag_measure_reported_frame_frag_id[] = { &hf_ieee80211_tag_measure_reported_frame_frag_rep_id, &hf_ieee80211_tag_measure_reported_frame_frag_number, &hf_ieee80211_tag_measure_reported_frame_frag_more, @@ -20826,7 +20826,7 @@ ieee80211_tag_erp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int *ieee80211_tag_erp_info_flags[] = { + static int * const ieee80211_tag_erp_info_flags[] = { &hf_ieee80211_tag_erp_info_erp_present, &hf_ieee80211_tag_erp_info_use_protection, &hf_ieee80211_tag_erp_info_barker_preamble_mode, @@ -21184,12 +21184,12 @@ static const val64_string he_mimo_cntrl_feedback_vals[] = { { 0, NULL } }; -static const int *he_phy_first_byte_headers[] = { +static int * const he_phy_first_byte_headers[] = { &hf_ieee80211_he_phy_cap_reserved_b0, NULL, }; -static const int *he_phy_channel_width_set_headers[] = { +static int * const he_phy_channel_width_set_headers[] = { &hf_ieee80211_he_40mhz_channel_2_4ghz, &hf_ieee80211_he_40_and_80_mhz_5ghz, &hf_ieee80211_he_160_mhz_5ghz, @@ -21200,7 +21200,7 @@ static const int *he_phy_channel_width_set_headers[] = { NULL }; -static const int *he_phy_b8_to_b23_headers[] = { +static int * const he_phy_b8_to_b23_headers[] = { &hf_ieee80211_he_phy_cap_punctured_preamble_rx, &hf_ieee80211_he_phy_cap_device_class, &hf_ieee80211_he_phy_cap_ldpc_coding_in_payload, @@ -21216,7 +21216,7 @@ static const int *he_phy_b8_to_b23_headers[] = { NULL }; -static const int *he_phy_b24_to_b39_headers[] = { +static int * const he_phy_b24_to_b39_headers[] = { &hf_ieee80211_he_phy_cap_dcm_max_constellation_tx, &hf_ieee80211_he_phy_cap_dcm_max_nss_tx, &hf_ieee80211_he_phy_cap_dcm_max_constellation_rx, @@ -21230,7 +21230,7 @@ static const int *he_phy_b24_to_b39_headers[] = { NULL }; -static const int *he_phy_b40_to_b55_headers[] = { +static int * const he_phy_b40_to_b55_headers[] = { &hf_ieee80211_he_phy_cap_number_of_sounding_dims_lte_80, &hf_ieee80211_he_phy_cap_number_of_sounding_dims_gt_80, &hf_ieee80211_he_phy_cap_ng_eq_16_su_fb, @@ -21246,7 +21246,7 @@ static const int *he_phy_b40_to_b55_headers[] = { NULL }; -static const int *he_phy_b56_to_b71_headers[] = { +static int * const he_phy_b56_to_b71_headers[] = { &hf_ieee80211_he_phy_cap_srp_based_sr_support, &hf_ieee80211_he_phy_cap_power_boost_factor_ar_support, &hf_ieee80211_he_phy_cap_he_su_ppdu_etc_gi, @@ -21263,7 +21263,7 @@ static const int *he_phy_b56_to_b71_headers[] = { NULL }; -static const int *he_phy_b72_to_b87_headers[] = { +static int * const he_phy_b72_to_b87_headers[] = { &hf_ieee80211_he_phy_cap_longer_than_16_he_sigb_ofdm_symbol_support, &hf_ieee80211_he_phy_cap_non_triggered_cqi_feedback, &hf_ieee80211_he_phy_cap_tx_1024_qam_242_tone_ru_support, @@ -21275,7 +21275,7 @@ static const int *he_phy_b72_to_b87_headers[] = { NULL }; -static const int *he_mcs_map_80_rx_headers [] = { +static int * const he_mcs_map_80_rx_headers [] = { &hf_ieee80211_he_mcs_max_he_mcs_80_rx_1_ss, &hf_ieee80211_he_mcs_max_he_mcs_80_rx_2_ss, &hf_ieee80211_he_mcs_max_he_mcs_80_rx_3_ss, @@ -21287,7 +21287,7 @@ static const int *he_mcs_map_80_rx_headers [] = { NULL }; -static const int *he_mcs_map_80_tx_headers [] = { +static int * const he_mcs_map_80_tx_headers [] = { &hf_ieee80211_he_mcs_max_he_mcs_80_tx_1_ss, &hf_ieee80211_he_mcs_max_he_mcs_80_tx_2_ss, &hf_ieee80211_he_mcs_max_he_mcs_80_tx_3_ss, @@ -21299,7 +21299,7 @@ static const int *he_mcs_map_80_tx_headers [] = { NULL }; -static const int *he_mcs_map_80p80_rx_headers [] = { +static int * const he_mcs_map_80p80_rx_headers [] = { &hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_1_ss, &hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_2_ss, &hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_3_ss, @@ -21311,7 +21311,7 @@ static const int *he_mcs_map_80p80_rx_headers [] = { NULL }; -static const int *he_mcs_map_80p80_tx_headers [] = { +static int * const he_mcs_map_80p80_tx_headers [] = { &hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_1_ss, &hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_2_ss, &hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_3_ss, @@ -21323,7 +21323,7 @@ static const int *he_mcs_map_80p80_tx_headers [] = { NULL }; -static const int *he_mcs_map_160_rx_headers [] = { +static int * const he_mcs_map_160_rx_headers [] = { &hf_ieee80211_he_mcs_max_he_mcs_160_rx_1_ss, &hf_ieee80211_he_mcs_max_he_mcs_160_rx_2_ss, &hf_ieee80211_he_mcs_max_he_mcs_160_rx_3_ss, @@ -21335,7 +21335,7 @@ static const int *he_mcs_map_160_rx_headers [] = { NULL }; -static const int *he_mcs_map_160_tx_headers [] = { +static int * const he_mcs_map_160_tx_headers [] = { &hf_ieee80211_he_mcs_max_he_mcs_160_tx_1_ss, &hf_ieee80211_he_mcs_max_he_mcs_160_tx_2_ss, &hf_ieee80211_he_mcs_max_he_mcs_160_tx_3_ss, @@ -21437,7 +21437,7 @@ dissect_he_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } proto_tree_add_bitmask_with_flags(tree, tvb, offset, hf_ieee80211_he_mac_capabilities, - ett_he_mac_capabilities, (const int**)he_mac_headers, + ett_he_mac_capabilities, he_mac_headers, ENC_LITTLE_ENDIAN, BMT_NO_APPEND); offset += 6; @@ -21646,7 +21646,7 @@ dissect_he_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } -static const int *he_operation_headers[] = { +static int * const he_operation_headers[] = { &hf_ieee80211_he_operation_default_pe_duration, &hf_ieee80211_he_operation_twt_required, &hf_ieee80211_he_operation_txop_duration_rts_threshold, @@ -21657,7 +21657,7 @@ static const int *he_operation_headers[] = { NULL }; -static const int *he_bss_color_info_headers[] = { +static int * const he_bss_color_info_headers[] = { &hf_ieee80211_he_bss_color_info_bss_color, &hf_ieee80211_he_bss_color_partial_bss_color, &hf_ieee80211_he_bss_color_bss_color_disabled, @@ -21672,7 +21672,7 @@ static const value_string he_mcs_map_vals[] = { { 0, NULL } }; -static const int *he_basic_he_mcs_header[] = { +static int * const he_basic_he_mcs_header[] = { &hf_ieee80211_he_oper_max_he_mcs_for_1_ss, &hf_ieee80211_he_oper_max_he_mcs_for_2_ss, &hf_ieee80211_he_oper_max_he_mcs_for_3_ss, @@ -21747,7 +21747,7 @@ dissect_he_operation(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } } -static const int *uora_headers[] = { +static int * const uora_headers[] = { &hf_ieee80211_he_uora_eocwmin, &hf_ieee80211_he_uora_owcwmax, &hf_ieee80211_he_uora_reserved, @@ -21764,7 +21764,7 @@ dissect_uora_parameter_set(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset++; } -static const int *muac_aci_aifsn_headers[] = { +static int * const muac_aci_aifsn_headers[] = { &hf_ieee80211_he_muac_aifsn, &hf_ieee80211_he_muac_acm, &hf_ieee80211_he_muac_aci, @@ -21826,7 +21826,7 @@ dissect_mu_edca_parameter_set(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree #define SRG_INFORMATION_PRESENT 0x08 #define HESIGA_SPATIAL_REUSE_VAL15_ALLOWED 0x10 -static const int *sr_control_field_headers[] = { +static int * const sr_control_field_headers[] = { &hf_ieee80211_he_srp_disallowed, &hf_ieee80211_he_non_srg_obss_pd_sr_disallowed, &hf_ieee80211_he_non_srg_offset_present, @@ -21880,7 +21880,7 @@ dissect_ndp_feedback_report_set(tvbuff_t *tvb, packet_info *pinfo _U_, 1, ENC_NA); } -static const int *bss_new_color_headers[] = { +static int * const bss_new_color_headers[] = { &hf_ieee80211_he_new_bss_color_info_color, &hf_ieee80211_he_new_bss_color_info_reserved, NULL @@ -21900,7 +21900,7 @@ dissect_bss_color_change(tvbuff_t *tvb, packet_info *pinfo _U_, ENC_NA, BMT_NO_APPEND); } -static const int *ess_info_field_headers[] = { +static int * const ess_info_field_headers[] = { &hf_ieee80211_he_ess_report_planned_ess, &hf_ieee80211_he_ess_report_edge_of_ess, NULL @@ -21970,7 +21970,7 @@ dissect_anti_clogging_token(tvbuff_t *tvb, packet_info *pinfo _U_, * AC=VI and AC=VO. */ -static const int *esp_headers[] = { +static int * const esp_headers[] = { &hf_ieee80211_esp_access_category, &hf_ieee80211_esp_reserved, &hf_ieee80211_esp_data_format, @@ -22102,7 +22102,7 @@ ieee80211_tag_twt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat int offset = 0; proto_item *item; - static const int *ieee80211_twt_ctrl_field[] = { + static int * const ieee80211_twt_ctrl_field[] = { &hf_ieee80211_tag_twt_ndp_paging_indicator, &hf_ieee80211_tag_twt_responder_pm_mode, &hf_ieee80211_tag_twt_neg_type, @@ -22110,7 +22110,7 @@ ieee80211_tag_twt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat NULL, }; - static const int *ieee80211_twt_req_type_field[] = { + static int * const ieee80211_twt_req_type_field[] = { &hf_ieee80211_tag_twt_req_type_req, &hf_ieee80211_tag_twt_req_type_setup_cmd, &hf_ieee80211_tag_twt_req_type_trigger, @@ -22271,7 +22271,7 @@ ieee80211_tag_fils_indication(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre return tvb_captured_length(tvb); } - static const int * ieee80211_tag_fils_indication_info[] = { + static int * const ieee80211_tag_fils_indication_info[] = { &hf_ieee80211_tag_fils_indication_info_nr_pk, &hf_ieee80211_tag_fils_indication_info_nr_realm, &hf_ieee80211_tag_fils_indication_info_ip_config, @@ -22498,7 +22498,7 @@ ieee80211_tag_mesh_configuration(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr int offset = 0; proto_item *item; proto_tree *subtree; - static const int *ieee80211_mesh_config_cap[] = { + static int * const ieee80211_mesh_config_cap[] = { &hf_ieee80211_mesh_config_cap_accepting, &hf_ieee80211_mesh_config_cap_mcca_support, &hf_ieee80211_mesh_config_cap_mcca_enabled, @@ -22578,7 +22578,7 @@ ieee80211_tag_mesh_preq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, targs = tvb_get_guint8(tvb, offset); offset += 1; for (i = 0; i < targs; i++) { - const int * targ_flags[] = { + static int * const targ_flags[] = { &hf_ieee80211_ff_hwmp_targ_to_flags, &hf_ieee80211_ff_hwmp_targ_usn_flags, NULL @@ -22700,7 +22700,7 @@ ieee80211_tag_mesh_channel_switch(tvbuff_t *tvb, packet_info *pinfo, proto_tree int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int * ieee80211_mesh_chswitch_flag[] = { + static int * const ieee80211_mesh_chswitch_flag[] = { &hf_ieee80211_mesh_chswitch_flag_initiator, &hf_ieee80211_mesh_chswitch_flag_txrestrict, NULL @@ -22832,7 +22832,7 @@ ieee80211_tag_dmg_capabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int * ieee80211_tag_dmg_cap1[] = { + static int * const ieee80211_tag_dmg_cap1[] = { &hf_ieee80211_tag_reverse_direction, &hf_ieee80211_tag_hlts, &hf_ieee80211_tag_tpc, @@ -22846,7 +22846,7 @@ ieee80211_tag_dmg_capabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr NULL }; - static const int * ieee80211_tag_dmg_cap2[] = { + static int * const ieee80211_tag_dmg_cap2[] = { &hf_ieee80211_tag_min_mpdu_spacing, &hf_ieee80211_tag_ba_flow_control, &hf_ieee80211_tag_max_sc_rx_mcs, @@ -22856,7 +22856,7 @@ ieee80211_tag_dmg_capabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr NULL }; - static const int * ieee80211_tag_dmg_cap3[] = { + static int * const ieee80211_tag_dmg_cap3[] = { &hf_ieee80211_tag_low_power_supported, &hf_ieee80211_tag_code_rate, &hf_ieee80211_tag_dtp, @@ -22870,7 +22870,7 @@ ieee80211_tag_dmg_capabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr NULL }; - static const int * ieee80211_tag_dmg_cap4[] = { + static int * const ieee80211_tag_dmg_cap4[] = { &hf_ieee80211_tag_pcp_tddti, &hf_ieee80211_tag_pcp_PSA, &hf_ieee80211_tag_pcp_handover, @@ -22882,7 +22882,7 @@ ieee80211_tag_dmg_capabilities(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr NULL }; - static const int * ieee80211_tag_dmg_cap5[] = { + static int * const ieee80211_tag_dmg_cap5[] = { &hf_ieee80211_tag_ext_sc_mcs_max_tx, &hf_ieee80211_tag_ext_sc_mcs_tx_code_7_8, &hf_ieee80211_tag_ext_sc_mcs_max_rx, @@ -22941,7 +22941,7 @@ ieee80211_tag_dmg_operation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int * ieee80211_tag_dmg_operation_flags[] = { + static int * const ieee80211_tag_dmg_operation_flags[] = { &hf_ieee80211_tag_pcp_tddti, &hf_ieee80211_tag_pcp_PSA, &hf_ieee80211_tag_pcp_handover, @@ -22977,7 +22977,7 @@ ieee80211_tag_antenna_section_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree * int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int * ieee80211_tag_antenna[] = { + static int * const ieee80211_tag_antenna[] = { &hf_ieee80211_tag_type, &hf_ieee80211_tag_tap1, &hf_ieee80211_tag_state1, @@ -23179,7 +23179,7 @@ ieee80211_tag_dmg_beam_refinement(tvbuff_t *tvb, packet_info *pinfo, proto_tree int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int * ieee80211_dmg_beam_refinement_fields[] = { + static int * const ieee80211_dmg_beam_refinement_fields[] = { &hf_ieee80211_tag_initiator, &hf_ieee80211_tag_tx_train_res, &hf_ieee80211_tag_rx_train_res, @@ -23248,7 +23248,7 @@ ieee80211_tag_dmg_tspec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi expert_add_info_format(pinfo, field_data->item_tag_length, &ei_ieee80211_tag_length, "Tag Length %u wrong, must be at least 14", tag_len); return tvb_captured_length(tvb); } - static const int * ieee80211_tag_tspec_flags[] = { + static int * const ieee80211_tag_tspec_flags[] = { &hf_ieee80211_tag_tspec_allocation_id, &hf_ieee80211_tag_tspec_allocation_type, &hf_ieee80211_tag_tspec_allocation_format, @@ -23366,13 +23366,13 @@ ieee80211_tag_multi_band(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; gboolean chiper_present, addr_present; - static const int * ieee80211_tag_multi_band_ctrl[] = { + static int * const ieee80211_tag_multi_band_ctrl[] = { &hf_ieee80211_tag_multi_band_ctrl_sta_role, &hf_ieee80211_tag_multi_band_ctrl_addr_present, &hf_ieee80211_tag_multi_band_ctrl_cipher_present, NULL }; - static const int * ieee80211_tag_multi_band_conn[] = { + static int * const ieee80211_tag_multi_band_conn[] = { &hf_ieee80211_tag_multi_band_conn_ap, &hf_ieee80211_tag_multi_band_conn_pcp, &hf_ieee80211_tag_multi_band_conn_dls, @@ -23499,7 +23499,7 @@ ieee80211_tag_switching_stream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr int tag_len = tvb_reported_length(tvb); ieee80211_tagged_field_data_t* field_data = (ieee80211_tagged_field_data_t*)data; int offset = 0; - static const int * ieee80211_tag_switching_stream_flags[] = { + static int * const ieee80211_tag_switching_stream_flags[] = { &hf_ieee80211_tag_switching_stream_old_tid, &hf_ieee80211_tag_switching_stream_old_direction, &hf_ieee80211_tag_switching_stream_new_tid, @@ -23905,7 +23905,7 @@ dissect_ieee80211_mgt(guint16 fcf, tvbuff_t *tvb, packet_info *pinfo, proto_tree /* * Dissect a Block Ack request (which is also used in Trigger frames). */ -static const int *block_ack_control_headers[] = { +static int * const block_ack_control_headers[] = { &hf_ieee80211_block_ack_control_ack_policy, &hf_ieee80211_block_ack_control_type, &hf_ieee80211_block_ack_control_reserved, @@ -23913,7 +23913,7 @@ static const int *block_ack_control_headers[] = { NULL }; -static const int *multi_sta_aid_tid_headers[] = { +static int * const multi_sta_aid_tid_headers[] = { &hf_ieee80211_block_ack_multi_sta_aid11, &hf_ieee80211_block_ack_multi_sta_ack_type, &hf_ieee80211_block_ack_multi_sta_tid, @@ -24275,7 +24275,7 @@ static const true_false_string mu_mimo_ltf_mode_tfs = { "HE single stream pilot HE LTF mode" }; -static const int *he_trig_frm_bar_ctrl_fields[] = { +static int * const he_trig_frm_bar_ctrl_fields[] = { &hf_ieee80211_he_trigger_bar_ctrl_ba_ack_policy, &hf_ieee80211_he_trigger_bar_ctrl_ba_type, &hf_ieee80211_he_trigger_bar_ctrl_reserved, @@ -24283,7 +24283,7 @@ static const int *he_trig_frm_bar_ctrl_fields[] = { NULL }; -static const int *he_trig_frm_bar_info_fields[] = { +static int * const he_trig_frm_bar_info_fields[] = { &hf_ieee80211_he_trigger_bar_info_blk_ack_seq_ctrl, NULL }; @@ -24338,7 +24338,7 @@ add_gcr_mu_bar_trigger_frame_common_info(proto_tree *tree, tvbuff_t *tvb, ENC_LITTLE_ENDIAN, BMT_NO_APPEND); } -static const int *common_info_headers[] = { +static int * const common_info_headers[] = { &hf_ieee80211_he_trigger_type, &hf_ieee80211_he_trigger_ul_length, &hf_ieee80211_he_trigger_more_tf, @@ -24437,7 +24437,7 @@ static const value_string preferred_ac_vals[] = { { 0, NULL } }; -static const int *basic_trigger_dependent_user_headers[] = { +static int * const basic_trigger_dependent_user_headers[] = { &hf_ieee80211_he_trigger_mpdu_mu_spacing, &hf_ieee80211_he_trigger_tid_aggregation_limit, &hf_ieee80211_he_trigger_dependent_reserved1, @@ -24483,7 +24483,7 @@ add_mu_bar_trigger_dependent_user_info(proto_tree *tree, tvbuff_t *tvb, } -static const int *nfrp_trigger_dependent_user_headers[] = { +static int * const nfrp_trigger_dependent_user_headers[] = { &hf_ieee80211_he_trigger_starting_aid, &hf_ieee80211_he_trigger_dependent_reserved2, &hf_ieee80211_he_trigger_feedback_type, @@ -24522,7 +24522,7 @@ target_rssi_base_custom(gchar *result, guint32 target_rssi) } } -static const int *user_info_headers_no_2045[] = { +static int * const user_info_headers_no_2045[] = { &hf_ieee80211_he_trigger_aid12, &hf_ieee80211_he_trigger_ru_allocation_region, &hf_ieee80211_he_trigger_ru_allocation, @@ -24536,7 +24536,7 @@ static const int *user_info_headers_no_2045[] = { NULL }; -static const int *user_info_headers_2045[] = { +static int * const user_info_headers_2045[] = { &hf_ieee80211_he_trigger_aid12, &hf_ieee80211_he_trigger_ru_allocation_region, &hf_ieee80211_he_trigger_ru_allocation, @@ -24681,7 +24681,7 @@ static const true_false_string he_ndp_annc_he_subfield_vals = { "VHT NDP Announcement frame" }; -static const int *vht_ndp_headers[] = { +static int * const vht_ndp_headers[] = { &hf_ieee80211_vht_ndp_annc_token_reserved, &hf_ieee80211_vht_ndp_annc_he_subfield, &hf_ieee80211_vht_ndp_annc_token_number, @@ -24737,14 +24737,14 @@ dissect_ieee80211_vht_ndp_annc(tvbuff_t *tvb, packet_info *pinfo _U_, return offset; } -static const int *he_ndp_headers[] = { +static int * const he_ndp_headers[] = { &hf_ieee80211_he_ndp_annc_reserved, &hf_ieee80211_he_ndp_annc_he_subfield, &hf_ieee80211_he_ndp_sounding_dialog_token_number, NULL }; -static const int *he_ndp_sta_headers[] = { +static int * const he_ndp_sta_headers[] = { &hf_ieee80211_he_ndp_annc_aid11, &hf_ieee80211_he_ndp_annc_ru_start, &hf_ieee80211_he_ndp_annc_ru_end, @@ -27021,7 +27021,7 @@ dissect_wlan_rsna_eapol_wpa_or_rsn_key(tvbuff_t *tvb, packet_info *pinfo, proto_ guint16 eapol_data_len; proto_tree *keydes_tree; proto_tree *ti = NULL; - static const int * wlan_rsna_eapol_wpa_keydes_keyinfo[] = { + static int * const wlan_rsna_eapol_wpa_keydes_keyinfo[] = { &hf_wlan_rsna_eapol_wpa_keydes_keyinfo_keydes_version, &hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_type, &hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_index, diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index b483697c15..6c2a24c587 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1566,7 +1566,7 @@ static void dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet, guint *offset) { guint16 fcf; - static const int * ieee802154_fields[] = { + static int * const ieee802154_fields[] = { &hf_ieee802154_frame_type, &hf_ieee802154_security, &hf_ieee802154_pending, @@ -1581,7 +1581,7 @@ dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee NULL }; - static const int* ieee802154_mpf_short_fields[] = { + static int* const ieee802154_mpf_short_fields[] = { &hf_ieee802154_frame_type, &hf_ieee802154_mpf_long_frame_control, &hf_ieee802154_mpf_dst_addr_mode, @@ -1589,7 +1589,7 @@ dissect_ieee802154_fcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee NULL }; - static const int* ieee802154_mpf_long_fields[] = { + static int* const ieee802154_mpf_long_fields[] = { &hf_ieee802154_frame_type, &hf_ieee802154_mpf_long_frame_control, &hf_ieee802154_mpf_dst_addr_mode, @@ -1708,7 +1708,7 @@ void dissect_ieee802154_aux_sec_header_and_key(tvbuff_t *tvb, packet_info *pinfo proto_item *ti, *hidden_item; guint8 security_control; guint aux_length = 1; /* Minimum length of the auxiliary header. */ - static const int * security_fields[] = { + static int * const security_fields[] = { &hf_ieee802154_aux_sec_security_level, &hf_ieee802154_aux_sec_key_id_mode, &hf_ieee802154_aux_sec_frame_counter_suppression, @@ -1891,7 +1891,7 @@ dissect_ieee802154_nonask_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (tree) { guint loffset = offset; - static const int * phr_fields[] = { + static int * const phr_fields[] = { &hf_ieee802154_nonask_phy_length, NULL }; @@ -3359,7 +3359,7 @@ ieee802154_create_pie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett) proto_item *subitem; proto_tree *subtree; header_field_info *hfinfo; - static const int * tlv_fields[] = { + static int * const tlv_fields[] = { &hf_ieee802154_payload_ie_type, &hf_ieee802154_payload_ie_id, &hf_ieee802154_payload_ie_length, @@ -3397,7 +3397,7 @@ ieee802154_create_psie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett) subitem = proto_tree_add_item(tree, hf, tvb, 0, tvb_reported_length(tvb), ENC_NA); subtree = proto_item_add_subtree(subitem, ett); if (tvb_get_letohs(tvb, 0) & IEEE802154_PSIE_TYPE_MASK) { - static const int * fields_long[] = { + static int * const fields_long[] = { &hf_ieee802154_psie_type, &hf_ieee802154_psie_id_long, &hf_ieee802154_psie_length_long, @@ -3406,7 +3406,7 @@ ieee802154_create_psie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett) proto_tree_add_bitmask(subtree, tvb, 0, hf_ieee802154_psie, ett_ieee802154_psie, fields_long, ENC_LITTLE_ENDIAN); } else { - static const int * fields_short[] = { + static int * const fields_short[] = { &hf_ieee802154_psie_type, &hf_ieee802154_psie_id_short, &hf_ieee802154_psie_length_short, @@ -3484,7 +3484,7 @@ dissect_802154_tsch_slotframe_link(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ /* Create a tree for each link in the slotframe. */ offset += 4; while (nb_links > 0) { - static const int * fields_options[] = { + static int * const fields_options[] = { &hf_ieee802154_tsch_slotf_link_options_tx, &hf_ieee802154_tsch_slotf_link_options_rx, &hf_ieee802154_tsch_slotf_link_options_shared, @@ -3581,7 +3581,7 @@ dissect_ietf_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, voi proto_item *type_item = NULL; proto_item *code_item = NULL; const gchar *code_str = NULL; - static const int * cell_options[] = { + static int * const cell_options[] = { &hf_ieee802154_6top_cell_option_tx, &hf_ieee802154_6top_cell_option_rx, &hf_ieee802154_6top_cell_option_shared, @@ -3780,7 +3780,7 @@ dissect_ietf_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, voi void dissect_ieee802154_superframe(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint *offset) { - static const int * superframe[] = { + static int * const superframe[] = { &hf_ieee802154_beacon_order, &hf_ieee802154_superframe_order, &hf_ieee802154_cap, @@ -3930,7 +3930,7 @@ ieee802154_create_hie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett) proto_item *subitem; proto_tree *subtree; header_field_info *hfinfo; - static const int * tlv_fields[] = { + static int * const tlv_fields[] = { &hf_ieee802154_header_ie_type, &hf_ieee802154_header_ie_id, &hf_ieee802154_header_ie_length, @@ -3980,7 +3980,7 @@ dissect_hie_csl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *d static int dissect_hie_time_correction(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_) { - static const int * fields[] = { + static int * const fields[] = { &hf_ieee802154_hie_time_correction_value, &hf_ieee802154_nack, NULL @@ -4107,7 +4107,7 @@ dissect_802154_eb_filter(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree *subtree; guint offset = 0; - static const int * fields_eb_filter[] = { + static int * const fields_eb_filter[] = { &hf_ieee802154_psie_eb_filter_pjoin, &hf_ieee802154_psie_eb_filter_lqi, &hf_ieee802154_psie_eb_filter_percent, @@ -4195,12 +4195,12 @@ dissect_pie_mlme(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ies_tree, void * static int dissect_mpx_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, void *data _U_) { - static const int * fields[] = { + static int * const fields[] = { &hf_ieee802159_mpx_transaction_id, &hf_ieee802159_mpx_transfer_type, NULL }; - static const int * fields_compressed_multiplex_id[] = { + static int * const fields_compressed_multiplex_id[] = { &hf_ieee802159_mpx_transaction_id_as_multiplex_id, &hf_ieee802159_mpx_transfer_type, NULL @@ -4445,7 +4445,7 @@ dissect_ieee802154_assoc_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { guint8 cap; proto_tree *subtree; - static const int * capability[] = { + static int * const capability[] = { &hf_ieee802154_cinfo_alt_coord, &hf_ieee802154_cinfo_device_type, &hf_ieee802154_cinfo_power_src, @@ -4682,7 +4682,7 @@ static void dissect_ieee802154_gtsreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet) { proto_tree *subtree; - static const int * characteristics[] = { + static int * const characteristics[] = { &hf_ieee802154_gtsreq_len, &hf_ieee802154_gtsreq_dir, &hf_ieee802154_gtsreq_type, diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index ef6e97fb8e..3899c8a2db 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -228,7 +228,7 @@ static const true_false_string ifcp_flags_spc_tfs = { static int dissect_ifcpflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_ifcp_flags_ses, &hf_ifcp_flags_trp, &hf_ifcp_flags_spc, @@ -247,7 +247,7 @@ dissect_ifcpflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) static void dissect_commonflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_ifcp_common_flags_crcv, NULL }; diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 748cb901d9..415f30752c 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -398,7 +398,7 @@ dissect_v3_max_resp(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_v3_sqrv_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * bits[] = { + static int * const bits[] = { &hf_suppress, &hf_qrv, NULL diff --git a/epan/dissectors/packet-ilp.c b/epan/dissectors/packet-ilp.c index 9254519287..aba9091f5f 100644 --- a/epan/dissectors/packet-ilp.c +++ b/epan/dissectors/packet-ilp.c @@ -1047,7 +1047,7 @@ dissect_ilp_GANSSPositioningMethodTypes(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const int * GANSSSignals_bits[] = { +static int * const GANSSSignals_bits[] = { &hf_ilp_GANSSSignals_signal1, &hf_ilp_GANSSSignals_signal2, &hf_ilp_GANSSSignals_signal3, @@ -1114,7 +1114,7 @@ dissect_ilp_T_addPosID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_addPosMode_bits[] = { +static int * const T_addPosMode_bits[] = { &hf_ilp_T_addPosMode_standalone, &hf_ilp_T_addPosMode_setBased, &hf_ilp_T_addPosMode_setAssisted, diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c index c67cceb3c8..05e9871a46 100644 --- a/epan/dissectors/packet-interlink.c +++ b/epan/dissectors/packet-interlink.c @@ -91,7 +91,7 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat } if (ilh_tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_interlink_flags_req_ack, &hf_interlink_flags_inc_ack_port, NULL diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 76e9b51515..dfaeb52fcf 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -799,7 +799,7 @@ static const true_false_string ip_opt_sec_prot_auth_fti_tfs = { "Final octet" }; -static const int *ip_opt_sec_prot_auth_fields_byte_1[] = { +static int * const ip_opt_sec_prot_auth_fields_byte_1[] = { &hf_ip_opt_sec_prot_auth_genser, &hf_ip_opt_sec_prot_auth_siop_esi, &hf_ip_opt_sec_prot_auth_sci, @@ -810,7 +810,7 @@ static const int *ip_opt_sec_prot_auth_fields_byte_1[] = { NULL }; -static const int *ip_opt_sec_prot_auth_fields_byte_n[] = { +static int * const ip_opt_sec_prot_auth_fields_byte_n[] = { &hf_ip_opt_sec_prot_auth_unassigned2, &hf_ip_opt_sec_prot_auth_fti, NULL @@ -2008,7 +2008,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* if (ip_security_flag) { /* RFC 3514 - The Security Flag in the IPv4 Header (April Fool's joke) */ proto_item *sf; - const int *ip_flags_evil[] = { + static int * const ip_flags_evil[] = { &hf_ip_flags_sf, &hf_ip_flags_df, &hf_ip_flags_mf, @@ -2021,7 +2021,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* expert_add_info(pinfo, sf, &ei_ip_evil_packet); } } else { - const int *ip_flags[] = { + static int * const ip_flags[] = { &hf_ip_flags_rf, &hf_ip_flags_df, &hf_ip_flags_mf, diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c index aeec7be956..32410581d4 100644 --- a/epan/dissectors/packet-ipmi-app.c +++ b/epan/dissectors/packet-ipmi-app.c @@ -410,9 +410,9 @@ static const value_string vals_XX_auth[] = { static void rs01(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_app_01_dev_prov_sdr, &hf_ipmi_app_01_dev_rev, NULL }; - static const gint *byte3[] = { &hf_ipmi_app_01_dev_avail, &hf_ipmi_app_01_fw_rev_maj, NULL }; - static const gint *byte6[] = { &hf_ipmi_app_01_ipmi_ads_chassis, &hf_ipmi_app_01_ipmi_ads_bridge, + static int * const byte2[] = { &hf_ipmi_app_01_dev_prov_sdr, &hf_ipmi_app_01_dev_rev, NULL }; + static int * const byte3[] = { &hf_ipmi_app_01_dev_avail, &hf_ipmi_app_01_fw_rev_maj, NULL }; + static int * const byte6[] = { &hf_ipmi_app_01_ipmi_ads_chassis, &hf_ipmi_app_01_ipmi_ads_bridge, &hf_ipmi_app_01_ipmi_ads_ipmb_ev_gen, &hf_ipmi_app_01_ipmi_ads_ipmb_ev_recv, &hf_ipmi_app_01_ipmi_ads_fru, &hf_ipmi_app_01_ipmi_ads_sel, &hf_ipmi_app_01_ipmi_ads_sdr, &hf_ipmi_app_01_ipmi_ads_sensor, NULL }; @@ -442,7 +442,7 @@ rs01(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs04(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_app_04_fail_sel, &hf_ipmi_app_04_fail_sdr, + static int * const byte2[] = { &hf_ipmi_app_04_fail_sel, &hf_ipmi_app_04_fail_sdr, &hf_ipmi_app_04_fail_bmc_fru, &hf_ipmi_app_04_fail_ipmb_sig, &hf_ipmi_app_04_fail_sdr_empty, &hf_ipmi_app_04_fail_iua, &hf_ipmi_app_04_fail_bb_fw, &hf_ipmi_app_04_fail_oper_fw, NULL }; int res, fail; @@ -485,8 +485,8 @@ rq05(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_06_syspwr_set, &hf_ipmi_app_06_syspwr_enum, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_06_devpwr_set, &hf_ipmi_app_06_devpwr_enum, NULL }; + static int * const byte1[] = { &hf_ipmi_app_06_syspwr_set, &hf_ipmi_app_06_syspwr_enum, NULL }; + static int * const byte2[] = { &hf_ipmi_app_06_devpwr_set, &hf_ipmi_app_06_devpwr_enum, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "ACPI System Power State: ", NULL, ett_ipmi_app_06_syspwr, byte1, ENC_LITTLE_ENDIAN, 0); @@ -499,8 +499,8 @@ rq06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs07(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_07_syspwr_enum, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_07_devpwr_enum, NULL }; + static int * const byte1[] = { &hf_ipmi_app_07_syspwr_enum, NULL }; + static int * const byte2[] = { &hf_ipmi_app_07_devpwr_enum, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "ACPI System Power State: ", NULL, ett_ipmi_app_07_syspwr, byte1, ENC_LITTLE_ENDIAN, 0); @@ -528,11 +528,11 @@ static const value_string cc22[] = { static void rq24(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_24_timer_use_dont_log, + static int * const byte1[] = { &hf_ipmi_app_24_timer_use_dont_log, &hf_ipmi_app_24_timer_use_dont_stop, &hf_ipmi_app_24_timer_use_timer_use, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_24_timer_action_interrupt, + static int * const byte2[] = { &hf_ipmi_app_24_timer_action_interrupt, &hf_ipmi_app_24_timer_action_timeout_action, NULL }; - static const gint *byte4[] = { &hf_ipmi_app_24_expiration_flags_oem, + static int * const byte4[] = { &hf_ipmi_app_24_expiration_flags_oem, &hf_ipmi_app_24_expiration_flags_smsos, &hf_ipmi_app_24_expiration_flags_osload, &hf_ipmi_app_24_expiration_flags_biospost, &hf_ipmi_app_24_expiration_flags_biosfrb2, NULL }; @@ -551,11 +551,11 @@ rq24(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs25(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_25_timer_use_dont_log, + static int * const byte1[] = { &hf_ipmi_app_25_timer_use_dont_log, &hf_ipmi_app_25_timer_use_started, &hf_ipmi_app_25_timer_use_timer_use, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_25_timer_action_interrupt, + static int * const byte2[] = { &hf_ipmi_app_25_timer_action_interrupt, &hf_ipmi_app_25_timer_action_timeout_action, NULL }; - static const gint *byte4[] = { &hf_ipmi_app_25_expiration_flags_oem, &hf_ipmi_app_25_expiration_flags_smsos, + static int * const byte4[] = { &hf_ipmi_app_25_expiration_flags_oem, &hf_ipmi_app_25_expiration_flags_smsos, &hf_ipmi_app_25_expiration_flags_osload, &hf_ipmi_app_25_expiration_flags_biospost, &hf_ipmi_app_25_expiration_flags_biosfrb2, NULL }; @@ -575,7 +575,7 @@ rs25(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq2e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_2e_byte1_oem2, &hf_ipmi_app_2e_byte1_oem1, + static int * const byte1[] = { &hf_ipmi_app_2e_byte1_oem2, &hf_ipmi_app_2e_byte1_oem1, &hf_ipmi_app_2e_byte1_oem0, &hf_ipmi_app_2e_byte1_sel, &hf_ipmi_app_2e_byte1_emb, &hf_ipmi_app_2e_byte1_emb_full_intr, &hf_ipmi_app_2e_byte1_rmq_intr, NULL }; @@ -588,7 +588,7 @@ rq2e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs2f(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_2f_byte1_oem2, &hf_ipmi_app_2f_byte1_oem1, + static int * const byte1[] = { &hf_ipmi_app_2f_byte1_oem2, &hf_ipmi_app_2f_byte1_oem1, &hf_ipmi_app_2f_byte1_oem0, &hf_ipmi_app_2f_byte1_sel, &hf_ipmi_app_2f_byte1_emb, &hf_ipmi_app_2f_byte1_emb_full_intr, &hf_ipmi_app_2f_byte1_rmq_intr, NULL }; @@ -601,7 +601,7 @@ rs2f(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq30(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_30_byte1_oem2, &hf_ipmi_app_30_byte1_oem1, + static int * const byte1[] = { &hf_ipmi_app_30_byte1_oem2, &hf_ipmi_app_30_byte1_oem1, &hf_ipmi_app_30_byte1_oem0, &hf_ipmi_app_30_byte1_wd_pretimeout, &hf_ipmi_app_30_byte1_emb, &hf_ipmi_app_30_byte1_rmq, NULL }; @@ -614,7 +614,7 @@ rq30(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs31(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_31_byte1_oem2, &hf_ipmi_app_31_byte1_oem1, + static int * const byte1[] = { &hf_ipmi_app_31_byte1_oem2, &hf_ipmi_app_31_byte1_oem1, &hf_ipmi_app_31_byte1_oem0, &hf_ipmi_app_31_byte1_wd_pretimeout, &hf_ipmi_app_31_byte1_emb, &hf_ipmi_app_31_byte1_rmq, NULL }; @@ -627,8 +627,8 @@ rs31(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq32(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_32_rq_chno, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_32_rq_state, NULL }; + static int * const byte1[] = { &hf_ipmi_app_32_rq_chno, NULL }; + static int * const byte2[] = { &hf_ipmi_app_32_rq_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_32_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -639,8 +639,8 @@ rq32(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs32(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_32_rs_chno, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_32_rs_state, NULL }; + static int * const byte1[] = { &hf_ipmi_app_32_rs_chno, NULL }; + static int * const byte2[] = { &hf_ipmi_app_32_rs_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_32_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -658,7 +658,7 @@ static const value_string cc33[] = { static void rs33(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_33_rs_chan, + static int * const byte1[] = { &hf_ipmi_app_33_rs_chan, &hf_ipmi_app_33_rs_priv, NULL }; tvbuff_t *next; ipmi_dissect_arg_t arg; @@ -683,7 +683,7 @@ rs33(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq34(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_34_track, &hf_ipmi_app_34_encrypt, + static int * const byte1[] = { &hf_ipmi_app_34_track, &hf_ipmi_app_34_encrypt, &hf_ipmi_app_34_auth, &hf_ipmi_app_34_chan, NULL }; tvbuff_t *next; ipmi_dissect_arg_t arg; @@ -736,8 +736,8 @@ static const value_string cc35[] = { static void rq38(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_38_rq_ipmi20, &hf_ipmi_app_38_rq_chan, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_38_rq_priv, NULL }; + static int * const byte1[] = { &hf_ipmi_app_38_rq_ipmi20, &hf_ipmi_app_38_rq_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_app_38_rq_priv, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_38_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_38_rq_byte2, byte2, ENC_LITTLE_ENDIAN, 0); @@ -746,13 +746,13 @@ rq38(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs38(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_38_rs_chan, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_38_rs_ipmi20, &hf_ipmi_app_38_rs_auth_oem, + static int * const byte1[] = { &hf_ipmi_app_38_rs_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_app_38_rs_ipmi20, &hf_ipmi_app_38_rs_auth_oem, &hf_ipmi_app_38_rs_auth_straight, &hf_ipmi_app_38_rs_auth_md5, &hf_ipmi_app_38_rs_auth_md2, &hf_ipmi_app_38_rs_auth_none, NULL }; - static const gint *byte3[] = { &hf_ipmi_app_38_rs_kg, &hf_ipmi_app_38_rs_permsg, &hf_ipmi_app_38_rs_userauth, + static int * const byte3[] = { &hf_ipmi_app_38_rs_kg, &hf_ipmi_app_38_rs_permsg, &hf_ipmi_app_38_rs_userauth, &hf_ipmi_app_38_rs_user_nonnull, &hf_ipmi_app_38_rs_user_null, &hf_ipmi_app_38_rs_user_anon, NULL }; - static const gint *byte4[] = { &hf_ipmi_app_38_rs_ipmi20_conn, &hf_ipmi_app_38_rs_ipmi15_conn, NULL }; + static int * const byte4[] = { &hf_ipmi_app_38_rs_ipmi20_conn, &hf_ipmi_app_38_rs_ipmi15_conn, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_38_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_app_38_rs_byte2, byte2, ENC_LITTLE_ENDIAN, BMT_NO_FALSE); @@ -768,7 +768,7 @@ rs38(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq39(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_39_authtype, NULL }; + static int * const byte1[] = { &hf_ipmi_app_39_authtype, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_39_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -793,8 +793,8 @@ static const value_string cc39[] = { static void rq3a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_3a_authtype, NULL }; - static const gint *byte2[] = { &hf_ipmi_app_3a_privlevel, NULL }; + static int * const byte1[] = { &hf_ipmi_app_3a_authtype, NULL }; + static int * const byte2[] = { &hf_ipmi_app_3a_privlevel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_3a_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -807,8 +807,8 @@ rq3a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs3a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_3a_authtype_session, NULL }; - static const gint *byte10[] = { &hf_ipmi_app_3a_maxpriv_session, NULL }; + static int * const byte1[] = { &hf_ipmi_app_3a_authtype_session, NULL }; + static int * const byte10[] = { &hf_ipmi_app_3a_maxpriv_session, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_3a_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -833,7 +833,7 @@ static const value_string cc3a[] = { static void rq3b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_3b_req_priv, NULL }; + static int * const byte1[] = { &hf_ipmi_app_3b_req_priv, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_3b_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -842,7 +842,7 @@ rq3b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs3b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_app_3b_new_priv, NULL }; + static int * const byte1[] = { &hf_ipmi_app_3b_new_priv, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_app_3b_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c index 92df21d60b..80038288e4 100644 --- a/epan/dissectors/packet-ipmi-chassis.c +++ b/epan/dissectors/packet-ipmi-chassis.c @@ -312,7 +312,7 @@ static const struct true_false_string tfs_09_valid = { static void bootopt_00(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_bo00_sip, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_bo00_sip, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_bo00_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -327,7 +327,7 @@ bootopt_01(tvbuff_t *tvb, proto_tree *tree) static void bootopt_02(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_bo02_request, &hf_ipmi_chs_bo02_discovered, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_bo02_request, &hf_ipmi_chs_bo02_discovered, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Service partition scan: ", "Not discovered", ett_ipmi_chs_bo02_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -336,7 +336,7 @@ bootopt_02(tvbuff_t *tvb, proto_tree *tree) static void bootopt_03(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_bo03_pef, &hf_ipmi_chs_bo03_cctrl_timeout, + static int * const byte1[] = { &hf_ipmi_chs_bo03_pef, &hf_ipmi_chs_bo03_cctrl_timeout, &hf_ipmi_chs_bo03_wd_timeout, &hf_ipmi_chs_bo03_softreset, &hf_ipmi_chs_bo03_powerup, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "BMC boot flag valid, don't clear on: ", @@ -346,7 +346,7 @@ bootopt_03(tvbuff_t *tvb, proto_tree *tree) static void bootopt_04(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_chs_bo04_bootinit_ack_oem, &hf_ipmi_chs_bo04_bootinit_ack_sms, + static int * const byte2[] = { &hf_ipmi_chs_bo04_bootinit_ack_oem, &hf_ipmi_chs_bo04_bootinit_ack_sms, &hf_ipmi_chs_bo04_bootinit_ack_os, &hf_ipmi_chs_bo04_bootinit_ack_osloader, &hf_ipmi_chs_bo04_bootinit_ack_bios, NULL }; @@ -358,14 +358,14 @@ bootopt_04(tvbuff_t *tvb, proto_tree *tree) static void bootopt_05(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_bo05_bootflags_valid, + static int * const byte1[] = { &hf_ipmi_chs_bo05_bootflags_valid, &hf_ipmi_chs_bo05_permanent, &hf_ipmi_chs_bo05_boottype, NULL }; - static const int *byte2[] = { &hf_ipmi_chs_bo05_cmos_clear, &hf_ipmi_chs_bo05_lock_kbd, + static int * const byte2[] = { &hf_ipmi_chs_bo05_cmos_clear, &hf_ipmi_chs_bo05_lock_kbd, &hf_ipmi_chs_bo05_bootdev, &hf_ipmi_chs_bo05_screen_blank, &hf_ipmi_chs_bo05_lockout_reset, NULL }; - static const int *byte3[] = { &hf_ipmi_chs_bo05_lockout_poweroff, &hf_ipmi_chs_bo05_bios_verbosity, + static int * const byte3[] = { &hf_ipmi_chs_bo05_lockout_poweroff, &hf_ipmi_chs_bo05_bios_verbosity, &hf_ipmi_chs_bo05_progress_traps, &hf_ipmi_chs_bo05_pwd_bypass, &hf_ipmi_chs_bo05_lock_sleep, &hf_ipmi_chs_bo05_console_redirection, NULL }; - static const int *byte4[] = { &hf_ipmi_chs_bo05_bios_shared_override, + static int * const byte4[] = { &hf_ipmi_chs_bo05_bios_shared_override, &hf_ipmi_chs_bo05_bios_muxctl_override, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_bo05_byte1, @@ -382,7 +382,7 @@ bootopt_05(tvbuff_t *tvb, proto_tree *tree) static void bootopt_06(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_bo06_chan_num, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_bo06_chan_num, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_bo06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -418,7 +418,7 @@ static struct { static void rs00(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_00_capflags_ppi, &hf_ipmi_chs_00_capflags_di, + static int * const byte1[] = { &hf_ipmi_chs_00_capflags_ppi, &hf_ipmi_chs_00_capflags_di, &hf_ipmi_chs_00_capflags_fpl, &hf_ipmi_chs_00_capflags_is, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Capabilities: ", "None", @@ -438,17 +438,17 @@ rs00(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs01(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_01_pwr_state_policy, + static int * const byte1[] = { &hf_ipmi_chs_01_pwr_state_policy, &hf_ipmi_chs_01_pwr_state_ctl_fault, &hf_ipmi_chs_01_pwr_state_fault, &hf_ipmi_chs_01_pwr_state_ilock, &hf_ipmi_chs_01_pwr_state_overload, &hf_ipmi_chs_01_pwr_state_powered, NULL }; - static const int *byte2[] = { &hf_ipmi_chs_01_last_event_via_ipmi, + static int * const byte2[] = { &hf_ipmi_chs_01_last_event_via_ipmi, &hf_ipmi_chs_01_last_event_down_by_fault, &hf_ipmi_chs_01_last_event_interlock, &hf_ipmi_chs_01_last_event_overload, &hf_ipmi_chs_01_last_event_ac_failed, NULL }; - static const int *byte3[] = { &hf_ipmi_chs_01_misc_identsupp, &hf_ipmi_chs_01_misc_identstate, + static int * const byte3[] = { &hf_ipmi_chs_01_misc_identsupp, &hf_ipmi_chs_01_misc_identstate, &hf_ipmi_chs_01_misc_fan, &hf_ipmi_chs_01_misc_drive, &hf_ipmi_chs_01_misc_fpl_active, &hf_ipmi_chs_01_misc_intrusion, NULL }; - static const int *byte4[] = { &hf_ipmi_chs_01_fpb_standby_allowed, + static int * const byte4[] = { &hf_ipmi_chs_01_fpb_standby_allowed, &hf_ipmi_chs_01_fpb_diagintr_allowed, &hf_ipmi_chs_01_fpb_reset_allowed, &hf_ipmi_chs_01_fpb_poweroff_allowed, &hf_ipmi_chs_01_fpb_standby_disabled, &hf_ipmi_chs_01_fpb_diagintr_disabled, &hf_ipmi_chs_01_fpb_reset_disabled, @@ -471,7 +471,7 @@ rs01(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq02(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_02_cctrl, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_02_cctrl, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_02_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -482,7 +482,7 @@ rq02(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq04(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_chs_04_perm_on, NULL }; + static int * const byte2[] = { &hf_ipmi_chs_04_perm_on, NULL }; if (tvb_captured_length(tvb) > 0) { proto_tree_add_item(tree, hf_ipmi_chs_04_ival, tvb, 0, 1, ENC_LITTLE_ENDIAN); @@ -499,7 +499,7 @@ rq04(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq05(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_05_flags_fpl, &hf_ipmi_chs_05_flags_intrusion, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_05_flags_fpl, &hf_ipmi_chs_05_flags_intrusion, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Capabilities: ", "None", ett_ipmi_chs_05_flags, byte1, ENC_LITTLE_ENDIAN, 0); @@ -518,7 +518,7 @@ rq05(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_06_rq_policy, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_06_rq_policy, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -529,7 +529,7 @@ rq06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_06_rs_policy_support_powerup, + static int * const byte1[] = { &hf_ipmi_chs_06_rs_policy_support_powerup, &hf_ipmi_chs_06_rs_policy_support_restore, &hf_ipmi_chs_06_rs_policy_support_poweroff, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Power Restore Policy support: ", "None", @@ -541,7 +541,7 @@ rs06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs07(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_07_cause, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_07_cause, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_chs_07_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -627,7 +627,7 @@ rq09(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs09(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_chs_09_rs_param_version, NULL }; + static int * const byte1[] = { &hf_ipmi_chs_09_rs_param_version, NULL }; proto_tree *s_tree; tvbuff_t *sub; guint8 pno; diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c index cf9e4de1c5..d2fa16c3bf 100644 --- a/epan/dissectors/packet-ipmi-picmg.c +++ b/epan/dissectors/packet-ipmi-picmg.c @@ -766,7 +766,7 @@ rq05(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs05(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_picmg_05_led3, &hf_ipmi_picmg_05_led2, + static int * const byte1[] = { &hf_ipmi_picmg_05_led3, &hf_ipmi_picmg_05_led2, &hf_ipmi_picmg_05_led1, &hf_ipmi_picmg_05_blue_led, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "General Status LEDs: ", "None", @@ -786,11 +786,11 @@ rq06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_picmg_06_cap_white, &hf_ipmi_picmg_06_cap_orange, + static int * const byte1[] = { &hf_ipmi_picmg_06_cap_white, &hf_ipmi_picmg_06_cap_orange, &hf_ipmi_picmg_06_cap_amber, &hf_ipmi_picmg_06_cap_green, &hf_ipmi_picmg_06_cap_red, &hf_ipmi_picmg_06_cap_blue, NULL }; - static const int *byte2[] = { &hf_ipmi_picmg_06_default_local_color, NULL }; - static const int *byte3[] = { &hf_ipmi_picmg_06_default_override_color, NULL }; + static int * const byte2[] = { &hf_ipmi_picmg_06_default_local_color, NULL }; + static int * const byte3[] = { &hf_ipmi_picmg_06_default_override_color, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Color capabilities: ", "None", ett_ipmi_picmg_06_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -803,7 +803,7 @@ rs06(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void parse_led_state(proto_tree *tree, tvbuff_t *tvb, guint offs, const char *desc) { - static const int *color[] = { &hf_ipmi_picmg_led_color, NULL }; + static int * const color[] = { &hf_ipmi_picmg_led_color, NULL }; static const value_string funcs[] = { { 0x00, "LED Off override" }, { 0xfb, "Lamp Test state" }, @@ -852,7 +852,7 @@ rq08(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs08(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_picmg_08_state_lamptest, &hf_ipmi_picmg_08_state_override, + static int * const byte1[] = { &hf_ipmi_picmg_08_state_lamptest, &hf_ipmi_picmg_08_state_override, &hf_ipmi_picmg_08_state_local, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "LED States: ", "None", @@ -914,8 +914,8 @@ rq09(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq0a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_picmg_0a_msk_d_locked, &hf_ipmi_picmg_0a_msk_locked, NULL }; - static const int *byte3[] = { &hf_ipmi_picmg_0a_d_locked, &hf_ipmi_picmg_0a_locked, NULL }; + static int * const byte2[] = { &hf_ipmi_picmg_0a_msk_d_locked, &hf_ipmi_picmg_0a_msk_locked, NULL }; + static int * const byte3[] = { &hf_ipmi_picmg_0a_d_locked, &hf_ipmi_picmg_0a_locked, NULL }; proto_tree_add_item(tree, hf_ipmi_picmg_0a_fruid, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, "Will affect bits: ", "None", @@ -935,7 +935,7 @@ rq0b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs0b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_picmg_0b_d_locked, &hf_ipmi_picmg_0b_locked, NULL }; + static int * const byte1[] = { &hf_ipmi_picmg_0b_d_locked, &hf_ipmi_picmg_0b_locked, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Activation Policy Bits: ", NULL, ett_ipmi_picmg_0b_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -971,7 +971,7 @@ rs0d(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void parse_link_info_state(proto_tree *tree, tvbuff_t *tvb, guint offs, const char *num, const value_string *vs) { - static const int *link_info[] = { &hf_ipmi_picmg_linkinfo_grpid, &hf_ipmi_picmg_linkinfo_type_ext, + static int * const link_info[] = { &hf_ipmi_picmg_linkinfo_grpid, &hf_ipmi_picmg_linkinfo_type_ext, &hf_ipmi_picmg_linkinfo_type, &hf_ipmi_picmg_linkinfo_ports, &hf_ipmi_picmg_linkinfo_iface, &hf_ipmi_picmg_linkinfo_chan, NULL }; guint8 v = tvb_get_guint8(tvb, offs + 4); @@ -1003,7 +1003,7 @@ rq0e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq0f(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *chan[] = { &hf_ipmi_picmg_0f_iface, &hf_ipmi_picmg_0f_chan, NULL }; + static int * const chan[] = { &hf_ipmi_picmg_0f_iface, &hf_ipmi_picmg_0f_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_picmg_0f_chan, chan, ENC_LITTLE_ENDIAN, 0); if (tvb_captured_length(tvb) > 1) { @@ -1081,7 +1081,7 @@ rq12(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs12(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_picmg_12_dynamic, &hf_ipmi_picmg_12_pwr_lvl, NULL }; + static int * const byte1[] = { &hf_ipmi_picmg_12_dynamic, &hf_ipmi_picmg_12_pwr_lvl, NULL }; guint8 v, v2, i; guint32 tmp, max; @@ -1127,7 +1127,7 @@ rq14(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs14(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *prop[] = { &hf_ipmi_picmg_14_local_control, NULL }; + static int * const prop[] = { &hf_ipmi_picmg_14_local_control, NULL }; proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_min, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_picmg_14_speed_max, tvb, 1, 1, ENC_LITTLE_ENDIAN); @@ -1274,13 +1274,13 @@ rs18(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void parse_amc_link_info_state(proto_tree *tree, tvbuff_t *tvb, guint offs) { - static const int *amc_link_info[] = { + static int * const amc_link_info[] = { &hf_ipmi_picmg_linkinfo_amc_ports, &hf_ipmi_picmg_linkinfo_amc_type, &hf_ipmi_picmg_linkinfo_amc_type_ext, &hf_ipmi_picmg_linkinfo_amc_grpid, NULL }; - static const int *amc_link_state[] = { + static int * const amc_link_state[] = { &hf_ipmi_picmg_linkinfo_state_0, &hf_ipmi_picmg_linkinfo_state_1, NULL }; @@ -1291,7 +1291,7 @@ parse_amc_link_info_state(proto_tree *tree, tvbuff_t *tvb, guint offs) ett_ipmi_picmg_link_state, amc_link_state, ENC_LITTLE_ENDIAN); } -static const int *amc_link_dev[] = { +static int * const amc_link_dev[] = { &hf_ipmi_picmg_linkinfo_dev_id, NULL }; @@ -1398,7 +1398,7 @@ rq1e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs1e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_picmg_1e_cap_diagintr, + static int * const byte1[] = { &hf_ipmi_picmg_1e_cap_diagintr, &hf_ipmi_picmg_1e_cap_graceful_reboot, &hf_ipmi_picmg_1e_cap_warm_reset, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "FRU Control Capabilities: ", "None", @@ -1461,7 +1461,7 @@ rq21(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs21(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte9[] = { &hf_ipmi_picmg_21_is_shm, &hf_ipmi_picmg_21_addr_type, NULL }; + static int * const byte9[] = { &hf_ipmi_picmg_21_is_shm, &hf_ipmi_picmg_21_addr_type, NULL }; guint8 addrtype; ipmi_add_timestamp(tree, hf_ipmi_picmg_21_tstamp, tvb, 0); @@ -1537,7 +1537,7 @@ static const value_string picmg_23_orientations[] = { static void rq23(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * picmg_23_rq_byte2[] = { + static int * const picmg_23_rq_byte2[] = { &hf_ipmi_picmg_23_slot_sel, &hf_ipmi_picmg_23_carrier_num, NULL @@ -1557,7 +1557,7 @@ rq23(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs23(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * picmg_23_rs_byte5[] = { + static int * const picmg_23_rs_byte5[] = { &hf_ipmi_picmg_23_slot_base, &hf_ipmi_picmg_23_tier_base, &hf_ipmi_picmg_23_orientation, @@ -1634,14 +1634,14 @@ rq25(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs25(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint * picmg_25_gstatus[] = { + static int * const picmg_25_gstatus[] = { &hf_ipmi_picmg_25_fault, &hf_ipmi_picmg_25_pwr_good, &hf_ipmi_picmg_25_mp_good, &hf_ipmi_picmg_25_role, NULL }; - static const gint * picmg_25_cstatus[] = { + static int * const picmg_25_cstatus[] = { &hf_ipmi_picmg_25_pwr_on, &hf_ipmi_picmg_25_pwr_ovr, &hf_ipmi_picmg_25_pwr, @@ -1681,7 +1681,7 @@ rq26(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs27(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint * picmg_27_status[] = { + static int * const picmg_27_status[] = { &hf_ipmi_picmg_27_pm_healthy, NULL }; @@ -1706,7 +1706,7 @@ fmt_100ms(gchar *s, guint32 v) static void rq28(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint * picmg_28_flags[] = { + static int * const picmg_28_flags[] = { &hf_ipmi_picmg_28_mch2, &hf_ipmi_picmg_28_mch1, NULL @@ -1733,7 +1733,7 @@ static const true_false_string picmg_29_alarm_modes = { static void rs29(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint * picmg_29_caps[] = { + static int * const picmg_29_caps[] = { &hf_ipmi_picmg_29_maj_rst, &hf_ipmi_picmg_29_min_rst, &hf_ipmi_picmg_29_alarm_cut, @@ -1839,14 +1839,14 @@ static const value_string amc_clock_resource_types[] = { { 0, NULL } }; -static const int * amc_clock_setting[] = { +static int * const amc_clock_setting[] = { &hf_ipmi_picmg_clock_pll, &hf_ipmi_picmg_clock_dir, &hf_ipmi_picmg_clock_state, NULL }; -static const int * amc_clock_resource[] = { +static int * const amc_clock_resource[] = { &hf_ipmi_picmg_clock_resource_type, &hf_ipmi_picmg_clock_resource_dev, NULL @@ -1902,7 +1902,7 @@ rs2d(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void add_component_bits(proto_tree *tree, tvbuff_t *tvb, guint offs, const char *desc) { - static const gint *compbits[] = { &hf_ipmi_picmg_XX_comp7, &hf_ipmi_picmg_XX_comp6, &hf_ipmi_picmg_XX_comp5, + static int * const compbits[] = { &hf_ipmi_picmg_XX_comp7, &hf_ipmi_picmg_XX_comp6, &hf_ipmi_picmg_XX_comp5, &hf_ipmi_picmg_XX_comp4, &hf_ipmi_picmg_XX_comp3, &hf_ipmi_picmg_XX_comp2, &hf_ipmi_picmg_XX_comp1, &hf_ipmi_picmg_XX_comp0, NULL }; proto_tree_add_bitmask_text(tree, tvb, offs, 1, desc, "None", @@ -1914,7 +1914,7 @@ add_component_bits(proto_tree *tree, tvbuff_t *tvb, guint offs, const char *desc static void rs2e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_picmg_2e_upgrade_undesirable, &hf_ipmi_picmg_2e_auto_rollback_override, + static int * const byte2[] = { &hf_ipmi_picmg_2e_upgrade_undesirable, &hf_ipmi_picmg_2e_auto_rollback_override, &hf_ipmi_picmg_2e_ipmc_degraded, &hf_ipmi_picmg_2e_deferred_activate, &hf_ipmi_picmg_2e_services_affected, &hf_ipmi_picmg_2e_manual_rollback, &hf_ipmi_picmg_2e_auto_rollback, &hf_ipmi_picmg_2e_self_test, NULL }; @@ -1938,7 +1938,7 @@ static const value_string cc2e[] = { static void prop_00(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_picmg_prop00_cold_reset, &hf_ipmi_picmg_prop00_deferred_activation, + static int * const byte1[] = { &hf_ipmi_picmg_prop00_cold_reset, &hf_ipmi_picmg_prop00_deferred_activation, &hf_ipmi_picmg_prop00_comparison, &hf_ipmi_picmg_prop00_preparation, &hf_ipmi_picmg_prop00_rollback, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "General Component Properties: ", "None", @@ -1948,7 +1948,7 @@ prop_00(tvbuff_t *tvb, proto_tree *tree) static void parse_version(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_picmg_prop01_fw_major, NULL }; + static int * const byte1[] = { &hf_ipmi_picmg_prop01_fw_major, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_picmg_prop01_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2110,7 +2110,7 @@ static void rs34(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { static const guint8 sig = 0; - static const gint *byte3[] = { &hf_ipmi_picmg_34_percentage, NULL }; + static int * const byte3[] = { &hf_ipmi_picmg_34_percentage, NULL }; guint8 v; ipmi_cmd_t *c; @@ -2152,7 +2152,7 @@ static const value_string cc35[] = { static void rs36(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_picmg_36_fail_sel, &hf_ipmi_picmg_36_fail_sdr, + static int * const byte2[] = { &hf_ipmi_picmg_36_fail_sel, &hf_ipmi_picmg_36_fail_sdr, &hf_ipmi_picmg_36_fail_bmc_fru, &hf_ipmi_picmg_36_fail_ipmb_sig, &hf_ipmi_picmg_36_fail_sdr_empty, &hf_ipmi_picmg_36_fail_iua, &hf_ipmi_picmg_36_fail_bb_fw, &hf_ipmi_picmg_36_fail_oper_fw, NULL }; int res, fail; @@ -2190,7 +2190,7 @@ static const value_string cc36[] = { static void rs37(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_picmg_37_percent, NULL }; + static int * const byte2[] = { &hf_ipmi_picmg_37_percent, NULL }; const char *desc; switch (ipmi_get_ccode(pinfo)) { @@ -2218,7 +2218,7 @@ rq3e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs3e(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *hpm2_caps[] = { + static int * const hpm2_caps[] = { &hf_ipmi_picmg_hpm2_dyn_ssn, &hf_ipmi_picmg_hpm2_ver_chg, &hf_ipmi_picmg_hpm2_ext_mgt, @@ -2447,7 +2447,7 @@ static const value_string amc_resource_types[] = { static void rs42(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *amc_resource_type[] = { + static int * const amc_resource_type[] = { &hf_ipmi_picmg_linkinfo_dev_type, &hf_ipmi_picmg_linkinfo_dev_id, NULL }; @@ -2554,7 +2554,7 @@ rq47(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs47(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { + static int * const byte1[] = { &hf_ipmi_picmg47_state, &hf_ipmi_picmg47_instance, NULL }; diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 60d138f2de..3dff24194f 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -2026,7 +2026,7 @@ cfgparam_14(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree) static void cp15_add_group_and_member(proto_tree *tree, tvbuff_t *tvb, guint offs, guint num) { - static const int *byte2[] = { &hf_ipmi_se_cp15_member_check, &hf_ipmi_se_cp15_member_id, NULL }; + static int * const byte2[] = { &hf_ipmi_se_cp15_member_check, &hf_ipmi_se_cp15_member_id, NULL }; const char *gdesc; guint8 tmp; @@ -2047,8 +2047,8 @@ cp15_add_group_and_member(proto_tree *tree, tvbuff_t *tvb, guint offs, guint num static void cfgparam_15(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_se_cp15_force, &hf_ipmi_se_cp15_delayed, &hf_ipmi_se_cp15_channel, NULL }; - static const int *byte11[] = { &hf_ipmi_se_cp15_retries, &hf_ipmi_se_cp15_operation, NULL }; + static int * const byte2[] = { &hf_ipmi_se_cp15_force, &hf_ipmi_se_cp15_delayed, &hf_ipmi_se_cp15_channel, NULL }; + static int * const byte11[] = { &hf_ipmi_se_cp15_retries, &hf_ipmi_se_cp15_operation, NULL }; proto_tree_add_item(tree, hf_ipmi_se_cp15_gctsel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_se_cp15_byte2, byte2, ENC_LITTLE_ENDIAN, 0); @@ -2173,7 +2173,7 @@ rq02(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs10(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_se_10_action_oem_filter, &hf_ipmi_se_10_action_diag_intr, + static int * const byte2[] = { &hf_ipmi_se_10_action_oem_filter, &hf_ipmi_se_10_action_diag_intr, &hf_ipmi_se_10_action_oem_action, &hf_ipmi_se_10_action_pwr_cycle, &hf_ipmi_se_10_action_reset, &hf_ipmi_se_10_action_pwr_down, &hf_ipmi_se_10_action_alert, NULL }; @@ -2288,7 +2288,7 @@ rq13(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs13(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_se_13_rev_present, &hf_ipmi_se_13_rev_compat, NULL }; + static int * const byte1[] = { &hf_ipmi_se_13_rev_present, &hf_ipmi_se_13_rev_compat, NULL }; proto_item *ti; tvbuff_t *sub; guint32 pno; @@ -2374,9 +2374,9 @@ static const value_string cc15[] = { static void rq16(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_se_16_chan, NULL }; - static const gint *byte2[] = { &hf_ipmi_se_16_op, &hf_ipmi_se_16_dst, NULL }; - static const gint *byte3[] = { &hf_ipmi_se_16_send_string, &hf_ipmi_se_16_string_sel, NULL }; + static int * const byte1[] = { &hf_ipmi_se_16_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_se_16_op, &hf_ipmi_se_16_dst, NULL }; + static int * const byte3[] = { &hf_ipmi_se_16_send_string, &hf_ipmi_se_16_string_sel, NULL }; tvbuff_t *sub; ipmi_set_data(pinfo, 0, (tvb_get_guint8(tvb, 1) & 0xc0) >> 6); @@ -2443,7 +2443,7 @@ rq20(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs20(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_se_20_rs_population, &hf_ipmi_se_20_rs_lun3, + static int * const byte2[] = { &hf_ipmi_se_20_rs_population, &hf_ipmi_se_20_rs_lun3, &hf_ipmi_se_20_rs_lun2, &hf_ipmi_se_20_rs_lun1, &hf_ipmi_se_20_rs_lun0, NULL }; guint32 val; @@ -2589,7 +2589,7 @@ rs25(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void add_thresholds(tvbuff_t *tvb, int offs, proto_tree *tree, const char *desc) { - static const int *threshold_mask[] = { &hf_ipmi_se_XX_m_unr, &hf_ipmi_se_XX_m_uc, &hf_ipmi_se_XX_m_unc, + static int * const threshold_mask[] = { &hf_ipmi_se_XX_m_unr, &hf_ipmi_se_XX_m_uc, &hf_ipmi_se_XX_m_unc, &hf_ipmi_se_XX_m_lnr, &hf_ipmi_se_XX_m_lc, &hf_ipmi_se_XX_m_lnc, NULL }; proto_tree_add_bitmask_text(tree, tvb, offs, 1, desc, "None", @@ -2631,7 +2631,7 @@ static void add_events(tvbuff_t *tvb, int offs, proto_tree *tree, const struct true_false_string *tfs, const char *desc) { - static const int *bsel[4][8] = { + static int * const bsel[4][8] = { { &hf_ipmi_se_XX_b1_0, &hf_ipmi_se_XX_b1_1, &hf_ipmi_se_XX_b1_2, &hf_ipmi_se_XX_b1_3, &hf_ipmi_se_XX_b1_4, &hf_ipmi_se_XX_b1_5, &hf_ipmi_se_XX_b1_6, &hf_ipmi_se_XX_b1_7 }, { &hf_ipmi_se_XX_b2_0, &hf_ipmi_se_XX_b2_1, &hf_ipmi_se_XX_b2_2, &hf_ipmi_se_XX_b2_3, @@ -2641,7 +2641,7 @@ add_events(tvbuff_t *tvb, int offs, proto_tree *tree, const struct true_false_st { &hf_ipmi_se_XX_b4_0, &hf_ipmi_se_XX_b4_1, &hf_ipmi_se_XX_b4_2, &hf_ipmi_se_XX_b4_3, &hf_ipmi_se_XX_b4_4, &hf_ipmi_se_XX_b4_5, &hf_ipmi_se_XX_b4_6, NULL } }; - static const int *tsel[] = { &ett_ipmi_se_XX_b1, &ett_ipmi_se_XX_b2, &ett_ipmi_se_XX_b3, &ett_ipmi_se_XX_b4 }; + static int * const tsel[] = { &ett_ipmi_se_XX_b1, &ett_ipmi_se_XX_b2, &ett_ipmi_se_XX_b3, &ett_ipmi_se_XX_b4 }; proto_tree *s_tree; int len = tvb_captured_length(tvb); int i, j, val, msk; @@ -2666,7 +2666,7 @@ add_events(tvbuff_t *tvb, int offs, proto_tree *tree, const struct true_false_st static void rq28(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_se_28_fl_evm, &hf_ipmi_se_28_fl_scan, &hf_ipmi_se_28_fl_action, NULL }; + static int * const byte2[] = { &hf_ipmi_se_28_fl_evm, &hf_ipmi_se_28_fl_scan, &hf_ipmi_se_28_fl_action, NULL }; static const struct true_false_string tfs_lect = { "Select", "Do not select" }; proto_tree_add_item(tree, hf_ipmi_se_28_sensor, tvb, 0, 1, ENC_LITTLE_ENDIAN); @@ -2685,7 +2685,7 @@ rq29(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs29(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_se_29_fl_evm, &hf_ipmi_se_29_fl_scan, NULL }; + static int * const byte1[] = { &hf_ipmi_se_29_fl_evm, &hf_ipmi_se_29_fl_scan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_29_byte1, byte1, ENC_LITTLE_ENDIAN, 0); add_events(tvb, 1, tree, &tfs_29_enabled, "Enabled events"); @@ -2714,7 +2714,7 @@ rq2b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs2b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_se_2b_fl_evm, &hf_ipmi_se_2b_fl_scan, &hf_ipmi_se_2b_fl_unavail, NULL }; + static int * const byte1[] = { &hf_ipmi_se_2b_fl_evm, &hf_ipmi_se_2b_fl_scan, &hf_ipmi_se_2b_fl_unavail, NULL }; static const struct true_false_string occur_tfs = { "Occurred", "Did not occur" }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_se_2b_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2733,14 +2733,14 @@ static void rs2d(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { /* Reuse flags from Event Status message */ - static const int *byte2[] = { &hf_ipmi_se_2b_fl_evm, &hf_ipmi_se_2b_fl_scan, &hf_ipmi_se_2b_fl_unavail, NULL }; - static const int *bsel[2][8] = { + static int * const byte2[] = { &hf_ipmi_se_2b_fl_evm, &hf_ipmi_se_2b_fl_scan, &hf_ipmi_se_2b_fl_unavail, NULL }; + static int * const bsel[2][8] = { { &hf_ipmi_se_2d_b1_0, &hf_ipmi_se_2d_b1_1, &hf_ipmi_se_2d_b1_2, &hf_ipmi_se_2d_b1_3, &hf_ipmi_se_2d_b1_4, &hf_ipmi_se_2d_b1_5, &hf_ipmi_se_2d_b1_6, &hf_ipmi_se_2d_b1_7 }, { &hf_ipmi_se_2d_b2_0, &hf_ipmi_se_2d_b2_1, &hf_ipmi_se_2d_b2_2, &hf_ipmi_se_2d_b2_3, &hf_ipmi_se_2d_b2_4, &hf_ipmi_se_2d_b2_5, &hf_ipmi_se_2d_b2_6, NULL } }; - static const int *tsel[2] = { &ett_ipmi_se_2d_b1, &ett_ipmi_se_2d_b2 }; + static int * const tsel[2] = { &ett_ipmi_se_2d_b1, &ett_ipmi_se_2d_b2 }; proto_tree *s_tree; int i, j, len; diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c index 11884e1ce9..f715433f4d 100644 --- a/epan/dissectors/packet-ipmi-storage.c +++ b/epan/dissectors/packet-ipmi-storage.c @@ -238,7 +238,7 @@ rq10(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs10(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *flags[] = { &hf_ipmi_stor_10_access, NULL }; + static int * const flags[] = { &hf_ipmi_stor_10_access, NULL }; proto_tree_add_item(tree, hf_ipmi_stor_10_size, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 2, 1, NULL, NULL, ett_ipmi_stor_10_flags, flags, ENC_LITTLE_ENDIAN, 0); @@ -293,7 +293,7 @@ static const value_string cc12[] = { static void rs20(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *ops[] = { &hf_ipmi_stor_20_op_overflow, &hf_ipmi_stor_20_op_update, + static int * const ops[] = { &hf_ipmi_stor_20_op_overflow, &hf_ipmi_stor_20_op_update, &hf_ipmi_stor_20_op_delete, &hf_ipmi_stor_20_op_partial_add, &hf_ipmi_stor_20_op_reserve, &hf_ipmi_stor_20_op_allocinfo, NULL }; @@ -366,7 +366,7 @@ rs24(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq25(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte6[] = { &hf_ipmi_stor_25_inprogress, NULL }; + static int * const byte6[] = { &hf_ipmi_stor_25_inprogress, NULL }; proto_tree_add_item(tree, hf_ipmi_stor_25_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_25_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); @@ -415,7 +415,7 @@ rq27(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs27(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *status[] = { &hf_ipmi_stor_27_status, NULL }; + static int * const status[] = { &hf_ipmi_stor_27_status, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_stor_27_status, status, ENC_LITTLE_ENDIAN, 0); @@ -442,7 +442,7 @@ rq29(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq2c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_stor_2c_init_agent, NULL }; + static int * const byte1[] = { &hf_ipmi_stor_2c_init_agent, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_stor_2c_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -451,7 +451,7 @@ rq2c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs2c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_stor_2c_init_state, NULL }; + static int * const byte1[] = { &hf_ipmi_stor_2c_init_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_stor_2c_rs_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -462,7 +462,7 @@ rs2c(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs40(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *ops[] = { &hf_ipmi_stor_40_op_overflow, &hf_ipmi_stor_40_op_delete, + static int * const ops[] = { &hf_ipmi_stor_40_op_overflow, &hf_ipmi_stor_40_op_delete, &hf_ipmi_stor_40_op_partial_add, &hf_ipmi_stor_40_op_reserve, &hf_ipmi_stor_40_op_allocinfo, NULL }; proto_tree_add_item(tree, hf_ipmi_stor_40_sel_version, tvb, 0, 1, ENC_LITTLE_ENDIAN); @@ -556,7 +556,7 @@ static const value_string cc44[] = { static void rq45(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte6[] = { &hf_ipmi_stor_45_inprogress, NULL }; + static int * const byte6[] = { &hf_ipmi_stor_45_inprogress, NULL }; proto_tree_add_item(tree, hf_ipmi_stor_45_rsrv_id, tvb, 0, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_stor_45_rec_id, tvb, 2, 2, ENC_LITTLE_ENDIAN); @@ -612,7 +612,7 @@ rq47(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs47(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *status[] = { &hf_ipmi_stor_47_status, NULL }; + static int * const status[] = { &hf_ipmi_stor_47_status, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_stor_47_status, status, ENC_LITTLE_ENDIAN, 0); @@ -639,7 +639,7 @@ rq49(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq5a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_stor_5a_log_type, NULL }; + static int * const byte1[] = { &hf_ipmi_stor_5a_log_type, NULL }; ipmi_set_data(pinfo, 0, tvb_get_guint8(tvb, 0) & 0x0f); if (!tree) { @@ -674,7 +674,7 @@ rs5a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq5b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_stor_5b_log_type, NULL }; + static int * const byte1[] = { &hf_ipmi_stor_5b_log_type, NULL }; guint8 v = tvb_get_guint8(tvb, 0); proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, diff --git a/epan/dissectors/packet-ipmi-trace.c b/epan/dissectors/packet-ipmi-trace.c index 65675c8449..a1962d058e 100644 --- a/epan/dissectors/packet-ipmi-trace.c +++ b/epan/dissectors/packet-ipmi-trace.c @@ -164,32 +164,32 @@ static const value_string str_ipmb_loc_statuses[] = { { 0, NULL } }; -static const gint * bits_trace_block_type[] = { +static int * const bits_trace_block_type[] = { &hf_trace_channel_num, &hf_trace_packet_type, NULL }; -static const gint * bits_ipmb_protocol_data[] = { +static int * const bits_ipmb_protocol_data[] = { &hf_trace_ipmb_link_num, &hf_trace_ipmb_red_chn, &hf_trace_dir, NULL }; -static const gint * bits_host_protocol_data[] = { +static int * const bits_host_protocol_data[] = { &hf_trace_dir, NULL }; -static const gint * bits_chn_state_info[] = { +static int * const bits_chn_state_info[] = { &hf_trace_ipmb_ovr_state, &hf_trace_ipmb_loc_state, NULL }; /* HPM.2 Trace Collection tree indices. */ -static gint * const ipmi_trace_ett[] = { +static int * const ipmi_trace_ett[] = { &ett_ipmi_trace, &ett_trace_block_type, &ett_trace_timestamp, diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c index 85198b13fc..2377a12cf3 100644 --- a/epan/dissectors/packet-ipmi-transport.c +++ b/epan/dissectors/packet-ipmi-transport.c @@ -812,13 +812,13 @@ static const value_string vals_18_state[] = { { 0, NULL } }; -static const int *lanXX_authtypes_byte[] = { &hf_ipmi_trn_lanXX_oem, &hf_ipmi_trn_lanXX_passwd, &hf_ipmi_trn_lanXX_md5, +static int * const lanXX_authtypes_byte[] = { &hf_ipmi_trn_lanXX_oem, &hf_ipmi_trn_lanXX_passwd, &hf_ipmi_trn_lanXX_md5, &hf_ipmi_trn_lanXX_md2, &hf_ipmi_trn_lanXX_none, NULL }; static void lan_serial_00(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan00_sip, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan00_sip, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan00_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -861,7 +861,7 @@ lan_03(tvbuff_t *tvb, proto_tree *tree) static void lan_04(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan04_ipsrc, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan04_ipsrc, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan04_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -882,8 +882,8 @@ lan_06(tvbuff_t *tvb, proto_tree *tree) static void lan_07(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_trn_lan07_flags, NULL }; - static const int *byte3[] = { &hf_ipmi_trn_lan07_precedence, &hf_ipmi_trn_lan07_tos, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_lan07_flags, NULL }; + static int * const byte3[] = { &hf_ipmi_trn_lan07_precedence, &hf_ipmi_trn_lan07_tos, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_lan07_ttl, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan07_byte2, byte2, ENC_LITTLE_ENDIAN, 0); @@ -905,7 +905,7 @@ lan_09(tvbuff_t *tvb, proto_tree *tree) static void lan_10(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan10_responses, &hf_ipmi_trn_lan10_gratuitous, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan10_responses, &hf_ipmi_trn_lan10_gratuitous, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan10_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } @@ -949,7 +949,7 @@ lan_16(tvbuff_t *tvb, proto_tree *tree) static void lan_17(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan17_num_dst, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan17_num_dst, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan17_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } @@ -957,9 +957,9 @@ lan_17(tvbuff_t *tvb, proto_tree *tree) static void lan_18(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan18_dst_selector, NULL }; - static const int *byte2[] = { &hf_ipmi_trn_lan18_ack, &hf_ipmi_trn_lan18_dst_type, NULL }; - static const int *byte4[] = { &hf_ipmi_trn_lan18_retries, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan18_dst_selector, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_lan18_ack, &hf_ipmi_trn_lan18_dst_type, NULL }; + static int * const byte4[] = { &hf_ipmi_trn_lan18_retries, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan18_byte1, byte1, ENC_LITTLE_ENDIAN, 0); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan18_byte2, byte2, ENC_LITTLE_ENDIAN, 0); @@ -970,9 +970,9 @@ lan_18(tvbuff_t *tvb, proto_tree *tree) static void lan_19(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan19_dst_selector, NULL }; - static const int *byte2[] = { &hf_ipmi_trn_lan19_addr_format, NULL }; - static const int *byte3[] = { &hf_ipmi_trn_lan19_gw_sel, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan19_dst_selector, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_lan19_addr_format, NULL }; + static int * const byte3[] = { &hf_ipmi_trn_lan19_gw_sel, NULL }; guint8 v; v = tvb_get_guint8(tvb, 1) >> 4; @@ -995,7 +995,7 @@ lan_19(tvbuff_t *tvb, proto_tree *tree) static void lan_20(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte12[] = { &hf_ipmi_trn_lan20_vlan_id_enable, &hf_ipmi_trn_lan20_vlan_id, NULL }; + static int * const byte12[] = { &hf_ipmi_trn_lan20_vlan_id_enable, &hf_ipmi_trn_lan20_vlan_id, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 2, NULL, NULL, ett_ipmi_trn_lan20_byte12, byte12, ENC_LITTLE_ENDIAN, 0); } @@ -1003,7 +1003,7 @@ lan_20(tvbuff_t *tvb, proto_tree *tree) static void lan_21(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan21_vlan_prio, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan21_vlan_prio, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan21_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } @@ -1011,7 +1011,7 @@ lan_21(tvbuff_t *tvb, proto_tree *tree) static void lan_22(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan22_num_cs_entries, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan22_num_cs_entries, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan22_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } @@ -1032,7 +1032,7 @@ lan_23(tvbuff_t *tvb, proto_tree *tree) static void lan_24(tvbuff_t *tvb, proto_tree *tree) { - static const int *ett[] = { &ett_ipmi_trn_lan24_byte1, &ett_ipmi_trn_lan24_byte2, &ett_ipmi_trn_lan24_byte3, + static int * const ett[] = { &ett_ipmi_trn_lan24_byte1, &ett_ipmi_trn_lan24_byte2, &ett_ipmi_trn_lan24_byte3, &ett_ipmi_trn_lan24_byte4, &ett_ipmi_trn_lan24_byte5, &ett_ipmi_trn_lan24_byte6, &ett_ipmi_trn_lan24_byte7, &ett_ipmi_trn_lan24_byte8 }; proto_tree *s_tree; @@ -1057,9 +1057,9 @@ lan_24(tvbuff_t *tvb, proto_tree *tree) static void lan_25(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan25_dst_selector, NULL }; - static const int *byte2[] = { &hf_ipmi_trn_lan25_addr_format, NULL }; - static const int *byte34[] = { &hf_ipmi_trn_lan25_uprio, &hf_ipmi_trn_lan25_cfi, &hf_ipmi_trn_lan25_vlan_id, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_lan25_dst_selector, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_lan25_addr_format, NULL }; + static int * const byte34[] = { &hf_ipmi_trn_lan25_uprio, &hf_ipmi_trn_lan25_cfi, &hf_ipmi_trn_lan25_vlan_id, NULL }; guint8 v; v = tvb_get_guint8(tvb, 1) >> 4; @@ -1090,7 +1090,7 @@ lan_26(tvbuff_t *tvb, proto_tree *tree) static void lan_50(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan50_ipv6_only, + static int * const byte1[] = { &hf_ipmi_trn_lan50_ipv6_only, &hf_ipmi_trn_lan50_both_ipv4_ipv6, &hf_ipmi_trn_lan50_ipv6_alerting, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Data 1", NULL, ett_ipmi_trn_lan50_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1123,7 +1123,7 @@ lan_54(tvbuff_t *tvb, proto_tree *tree) static void lan_55(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte3[] = { &hf_ipmi_trn_lan55_dhcpv6_support, + static int * const byte3[] = { &hf_ipmi_trn_lan55_dhcpv6_support, &hf_ipmi_trn_lan55_slaac_support, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_lan55_static_addr_max, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_ipmi_trn_lan55_dynamic_addr_max, tvb, 1, 1, ENC_LITTLE_ENDIAN); @@ -1133,7 +1133,7 @@ lan_55(tvbuff_t *tvb, proto_tree *tree) static void lan_56(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte2[] = { &hf_ipmi_trn_lanXX_addr_type, + static int * const byte2[] = { &hf_ipmi_trn_lanXX_addr_type, &hf_ipmi_trn_lanXX_addr_enable, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_lanXX_addr_selector, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, ett_ipmi_trn_lan56_byte2, byte2, ENC_LITTLE_ENDIAN, 0); @@ -1216,7 +1216,7 @@ lan_63(tvbuff_t *tvb, proto_tree *tree) static void lan_64(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_lan64_static_cfg, + static int * const byte1[] = { &hf_ipmi_trn_lan64_static_cfg, &hf_ipmi_trn_lan64_dynamic_cfg, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_lan64_byte1, byte1, ENC_LITTLE_ENDIAN, 0); } @@ -1400,7 +1400,7 @@ static struct { static void rq01(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_01_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_01_chan, NULL }; tvbuff_t *next; const char *desc; guint8 pno; @@ -1438,7 +1438,7 @@ static const value_string cc01[] = { static void rq02(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_02_getrev, &hf_ipmi_trn_02_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_02_getrev, &hf_ipmi_trn_02_chan, NULL }; const char *desc; guint8 pno; @@ -1470,7 +1470,7 @@ rq02(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs02(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_02_rev_present, &hf_ipmi_trn_02_rev_compat, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_02_rev_present, &hf_ipmi_trn_02_rev_compat, NULL }; proto_item *ti; proto_tree *subtree; tvbuff_t *next; @@ -1523,8 +1523,8 @@ static const value_string cc02[] = { static void rq03(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_03_chan, NULL }; - static const int *byte2[] = { &hf_ipmi_trn_03_arp_resp, &hf_ipmi_trn_03_gratuitous_arp, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_03_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_03_arp_resp, &hf_ipmi_trn_03_gratuitous_arp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_03_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1535,7 +1535,7 @@ rq03(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs03(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_03_status_arp_resp, + static int * const byte1[] = { &hf_ipmi_trn_03_status_arp_resp, &hf_ipmi_trn_03_status_gratuitous_arp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, @@ -1545,8 +1545,8 @@ rs03(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq04(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_04_chan, NULL }; - static const int *byte2[] = { &hf_ipmi_trn_04_clear, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_04_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_04_clear, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_04_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1571,7 +1571,7 @@ rs04(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void serial_03(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_serial03_connmode, &hf_ipmi_trn_serial03_terminal, + static int * const byte1[] = { &hf_ipmi_trn_serial03_connmode, &hf_ipmi_trn_serial03_terminal, &hf_ipmi_trn_serial03_ppp, &hf_ipmi_trn_serial03_basic, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, @@ -1592,7 +1592,7 @@ serial04_timeout_fmt(gchar *s, guint32 v) static void serial_04(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial04_timeout, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial04_timeout, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial04_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1601,9 +1601,9 @@ serial_04(tvbuff_t *tvb, proto_tree *tree) static void serial_05(tvbuff_t *tvb, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_serial05_cbcp_callback, + static int * const byte1[] = { &hf_ipmi_trn_serial05_cbcp_callback, &hf_ipmi_trn_serial05_ipmi_callback, NULL }; - static const int *byte2[] = { &hf_ipmi_trn_serial05_cb_list, &hf_ipmi_trn_serial05_cb_user, + static int * const byte2[] = { &hf_ipmi_trn_serial05_cb_list, &hf_ipmi_trn_serial05_cb_user, &hf_ipmi_trn_serial05_cb_prespec, &hf_ipmi_trn_serial05_no_cb, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Callback capabilities: ", "None", @@ -1618,7 +1618,7 @@ serial_05(tvbuff_t *tvb, proto_tree *tree) static void serial_06(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial06_inactivity, + static int * const byte1[] = { &hf_ipmi_trn_serial06_inactivity, &hf_ipmi_trn_serial06_dcd, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, @@ -1628,8 +1628,8 @@ serial_06(tvbuff_t *tvb, proto_tree *tree) static void serial_07(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial07_flowctl, &hf_ipmi_trn_serial07_dtrhangup, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial07_bitrate, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial07_flowctl, &hf_ipmi_trn_serial07_dtrhangup, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial07_bitrate, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial07_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1640,11 +1640,11 @@ serial_07(tvbuff_t *tvb, proto_tree *tree) static void serial_08(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial08_esc_powerup, + static int * const byte1[] = { &hf_ipmi_trn_serial08_esc_powerup, &hf_ipmi_trn_serial08_esc_reset, &hf_ipmi_trn_serial08_switch_authcap, &hf_ipmi_trn_serial08_switch_rmcp, &hf_ipmi_trn_serial08_esc_switch1, &hf_ipmi_trn_serial08_esc_switch2, &hf_ipmi_trn_serial08_switch_dcdloss, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial08_sharing, + static int * const byte2[] = { &hf_ipmi_trn_serial08_sharing, &hf_ipmi_trn_serial08_ping_callback, &hf_ipmi_trn_serial08_ping_direct, &hf_ipmi_trn_serial08_ping_retry, NULL }; @@ -1657,8 +1657,8 @@ serial_08(tvbuff_t *tvb, proto_tree *tree) static void serial_09(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial09_ring_duration, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial09_ring_dead, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial09_ring_duration, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial09_ring_dead, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial09_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1706,7 +1706,7 @@ serial_15(tvbuff_t *tvb, proto_tree *tree) static void serial_16(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial16_ndest, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial16_ndest, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial16_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1715,10 +1715,10 @@ serial_16(tvbuff_t *tvb, proto_tree *tree) static void serial_17(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial17_dest_sel, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial17_ack, &hf_ipmi_trn_serial17_dest_type, NULL }; - static const gint *byte4[] = { &hf_ipmi_trn_serial17_alert_retries, &hf_ipmi_trn_serial17_call_retries, NULL }; - const gint *byte5[3] = { NULL, NULL, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial17_dest_sel, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial17_ack, &hf_ipmi_trn_serial17_dest_type, NULL }; + static int * const byte4[] = { &hf_ipmi_trn_serial17_alert_retries, &hf_ipmi_trn_serial17_call_retries, NULL }; + int * byte5[3] = { NULL, NULL, NULL }; guint8 v; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, @@ -1760,10 +1760,10 @@ serial_18(tvbuff_t *tvb, proto_tree *tree) static void serial_19(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial19_destsel, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial19_flowctl, &hf_ipmi_trn_serial19_dtrhangup, + static int * const byte1[] = { &hf_ipmi_trn_serial19_destsel, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial19_flowctl, &hf_ipmi_trn_serial19_dtrhangup, &hf_ipmi_trn_serial19_stopbits, &hf_ipmi_trn_serial19_charsize, &hf_ipmi_trn_serial19_parity, NULL }; - static const gint *byte3[] = { &hf_ipmi_trn_serial19_bitrate, NULL }; + static int * const byte3[] = { &hf_ipmi_trn_serial19_bitrate, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial19_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1776,7 +1776,7 @@ serial_19(tvbuff_t *tvb, proto_tree *tree) static void serial_20(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial20_num_dial_strings, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial20_num_dial_strings, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial20_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1785,7 +1785,7 @@ serial_20(tvbuff_t *tvb, proto_tree *tree) static void serial_21(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial21_dialsel, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial21_dialsel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial21_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1796,7 +1796,7 @@ serial_21(tvbuff_t *tvb, proto_tree *tree) static void serial_22(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial22_num_ipaddrs, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial22_num_ipaddrs, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial22_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1805,7 +1805,7 @@ serial_22(tvbuff_t *tvb, proto_tree *tree) static void serial_23(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial23_destsel, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial23_destsel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial23_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1815,7 +1815,7 @@ serial_23(tvbuff_t *tvb, proto_tree *tree) static void serial_24(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial24_num_tap_accounts, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial24_num_tap_accounts, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial24_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1824,7 +1824,7 @@ serial_24(tvbuff_t *tvb, proto_tree *tree) static void serial_25(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_trn_serial25_dialstr_sel, &hf_ipmi_trn_serial25_tapsrv_sel, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial25_dialstr_sel, &hf_ipmi_trn_serial25_tapsrv_sel, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_serial25_tap_acct, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, @@ -1848,13 +1848,13 @@ serial_27(tvbuff_t *tvb, proto_tree *tree) static void serial_28(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial28_tapsrv_sel, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial28_confirm, NULL }; - static const gint *byte10[] = { &hf_ipmi_trn_serial28_t2, &hf_ipmi_trn_serial28_t1, NULL }; - static const gint *byte11[] = { &hf_ipmi_trn_serial28_t4, &hf_ipmi_trn_serial28_t3, NULL }; - static const gint *byte12[] = { &hf_ipmi_trn_serial28_t6, &hf_ipmi_trn_serial28_t5, NULL }; - static const gint *byte13[] = { &hf_ipmi_trn_serial28_n2, &hf_ipmi_trn_serial28_n1, NULL }; - static const gint *byte14[] = { &hf_ipmi_trn_serial28_n4, &hf_ipmi_trn_serial28_n3, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial28_tapsrv_sel, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial28_confirm, NULL }; + static int * const byte10[] = { &hf_ipmi_trn_serial28_t2, &hf_ipmi_trn_serial28_t1, NULL }; + static int * const byte11[] = { &hf_ipmi_trn_serial28_t4, &hf_ipmi_trn_serial28_t3, NULL }; + static int * const byte12[] = { &hf_ipmi_trn_serial28_t6, &hf_ipmi_trn_serial28_t5, NULL }; + static int * const byte13[] = { &hf_ipmi_trn_serial28_n2, &hf_ipmi_trn_serial28_n1, NULL }; + static int * const byte14[] = { &hf_ipmi_trn_serial28_n4, &hf_ipmi_trn_serial28_n3, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial28_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1877,9 +1877,9 @@ serial_28(tvbuff_t *tvb, proto_tree *tree) static void serial_29(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial29_op, &hf_ipmi_trn_serial29_lineedit, + static int * const byte1[] = { &hf_ipmi_trn_serial29_op, &hf_ipmi_trn_serial29_lineedit, &hf_ipmi_trn_serial29_deletectl, &hf_ipmi_trn_serial29_echo, &hf_ipmi_trn_serial29_handshake, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial29_o_newline, &hf_ipmi_trn_serial29_i_newline, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial29_o_newline, &hf_ipmi_trn_serial29_i_newline, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial29_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1890,10 +1890,10 @@ serial_29(tvbuff_t *tvb, proto_tree *tree) static void serial_30(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial30_snooping, &hf_ipmi_trn_serial30_snoopctl, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_serial30_negot_ctl, &hf_ipmi_trn_serial30_use_xmit_accm, + static int * const byte1[] = { &hf_ipmi_trn_serial30_snooping, &hf_ipmi_trn_serial30_snoopctl, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_serial30_negot_ctl, &hf_ipmi_trn_serial30_use_xmit_accm, &hf_ipmi_trn_serial30_xmit_addr_comp, &hf_ipmi_trn_serial30_xmit_proto_comp, NULL }; - static const gint *byte3[] = { &hf_ipmi_trn_serial30_ipaddr, &hf_ipmi_trn_serial30_accm, + static int * const byte3[] = { &hf_ipmi_trn_serial30_ipaddr, &hf_ipmi_trn_serial30_accm, &hf_ipmi_trn_serial30_addr_comp, &hf_ipmi_trn_serial30_proto_comp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, @@ -1919,7 +1919,7 @@ serial_32(tvbuff_t *tvb, proto_tree *tree) static void serial_33(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial33_auth_proto, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial33_auth_proto, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial33_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -1947,7 +1947,7 @@ serial_36(tvbuff_t *tvb, proto_tree *tree) static void serial_37(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial37_num_ppp, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial37_num_ppp, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_serial37_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2009,7 +2009,7 @@ serial_42(tvbuff_t *tvb, proto_tree *tree) static void serial_43(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial43_auth_proto, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_serial43_auth_proto, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_serial43_acct_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); proto_tree_add_bitmask_text(tree, tvb, 1, 1, NULL, NULL, @@ -2064,7 +2064,7 @@ serial_49(tvbuff_t *tvb, proto_tree *tree) static void serial_50(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_serial50_115200, &hf_ipmi_trn_serial50_57600, + static int * const byte1[] = { &hf_ipmi_trn_serial50_115200, &hf_ipmi_trn_serial50_57600, &hf_ipmi_trn_serial50_38400, &hf_ipmi_trn_serial50_19200, &hf_ipmi_trn_serial50_9600, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, "Bit rate support: ", "None", @@ -2074,8 +2074,8 @@ serial_50(tvbuff_t *tvb, proto_tree *tree) static void serial_51(tvbuff_t *tvb, proto_tree *tree) { - static const gint *byte2[] = { &hf_ipmi_trn_serial51_ipmi_channel, &hf_ipmi_trn_serial51_conn_num, NULL }; - static const gint *byte3[] = { &hf_ipmi_trn_serial51_ipmi_sharing, + static int * const byte2[] = { &hf_ipmi_trn_serial51_ipmi_channel, &hf_ipmi_trn_serial51_conn_num, NULL }; + static int * const byte3[] = { &hf_ipmi_trn_serial51_ipmi_sharing, &hf_ipmi_trn_serial51_ipmi_sol, &hf_ipmi_trn_serial51_chan_num, NULL }; proto_tree_add_item(tree, hf_ipmi_trn_serial51_port_assoc_sel, tvb, 0, 1, ENC_LITTLE_ENDIAN); @@ -2164,7 +2164,7 @@ static struct { static void rq10(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_10_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_10_chan, NULL }; tvbuff_t *next; const char *desc; guint8 pno; @@ -2203,7 +2203,7 @@ static const value_string cc10[] = { static void rq11(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_11_getrev, &hf_ipmi_trn_11_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_11_getrev, &hf_ipmi_trn_11_chan, NULL }; const char *desc; guint8 pno; @@ -2235,7 +2235,7 @@ rq11(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs11(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int *byte1[] = { &hf_ipmi_trn_11_rev_present, &hf_ipmi_trn_11_rev_compat, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_11_rev_present, &hf_ipmi_trn_11_rev_compat, NULL }; proto_item *ti; proto_tree *subtree; tvbuff_t *next; @@ -2289,8 +2289,8 @@ static const value_string cc11[] = { static void rq12(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_12_chan, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_12_mux_setting, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_12_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_12_mux_setting, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_12_rq_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2301,7 +2301,7 @@ rq12(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rs12(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_12_sw_to_sys, &hf_ipmi_trn_12_sw_to_bmc, + static int * const byte1[] = { &hf_ipmi_trn_12_sw_to_sys, &hf_ipmi_trn_12_sw_to_bmc, &hf_ipmi_trn_12_alert, &hf_ipmi_trn_12_msg, &hf_ipmi_trn_12_req, &hf_ipmi_trn_12_mux_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, @@ -2313,7 +2313,7 @@ rs12(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq13(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_13_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_13_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_13_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2334,7 +2334,7 @@ rs13(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq14(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_14_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_14_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_14_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2347,7 +2347,7 @@ rq14(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq15(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_15_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_15_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_15_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2365,7 +2365,7 @@ rs15(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq16(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_16_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_16_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_16_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2394,8 +2394,8 @@ tr17_fmt_blockno(gchar *s, guint32 v) static void rq17(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_17_chan, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_17_clear, &hf_ipmi_trn_17_block_num, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_17_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_17_clear, &hf_ipmi_trn_17_block_num, NULL }; ipmi_set_data(pinfo, 0, tvb_get_guint8(tvb, 1) & 0x7f); if (!tree) { @@ -2433,7 +2433,7 @@ static const value_string cc17[] = { static void rq18(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_18_state, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_18_state, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_18_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2445,8 +2445,8 @@ rq18(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq19(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_19_chan, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_19_dest_sel, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_19_chan, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_19_dest_sel, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_19_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2465,8 +2465,8 @@ static const value_string cc19[] = { static void parse_callback_options(tvbuff_t *tvb, guint offs, proto_tree *tree) { - static const gint *usercap[] = { &hf_ipmi_trn_XX_cap_cbcp, &hf_ipmi_trn_XX_cap_ipmi, NULL }; - static const gint *cbcp[] = { &hf_ipmi_trn_XX_cbcp_from_list, &hf_ipmi_trn_XX_cbcp_user, + static int * const usercap[] = { &hf_ipmi_trn_XX_cap_cbcp, &hf_ipmi_trn_XX_cap_ipmi, NULL }; + static int * const cbcp[] = { &hf_ipmi_trn_XX_cbcp_from_list, &hf_ipmi_trn_XX_cbcp_user, &hf_ipmi_trn_XX_cbcp_prespec, &hf_ipmi_trn_XX_cbcp_nocb, NULL }; proto_tree_add_bitmask_text(tree, tvb, offs, 1, @@ -2485,8 +2485,8 @@ parse_callback_options(tvbuff_t *tvb, guint offs, proto_tree *tree) static void rq1a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_1a_user, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_1a_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_1a_user, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_1a_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_1a_byte1, byte1, ENC_LITTLE_ENDIAN, 0); @@ -2500,8 +2500,8 @@ rq1a(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void rq1b(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint *byte1[] = { &hf_ipmi_trn_1b_user, NULL }; - static const gint *byte2[] = { &hf_ipmi_trn_1b_chan, NULL }; + static int * const byte1[] = { &hf_ipmi_trn_1b_user, NULL }; + static int * const byte2[] = { &hf_ipmi_trn_1b_chan, NULL }; proto_tree_add_bitmask_text(tree, tvb, 0, 1, NULL, NULL, ett_ipmi_trn_1b_byte1, byte1, ENC_LITTLE_ENDIAN, 0); diff --git a/epan/dissectors/packet-ipmi-vita.c b/epan/dissectors/packet-ipmi-vita.c index 4db396f187..489e97fe9a 100644 --- a/epan/dissectors/packet-ipmi-vita.c +++ b/epan/dissectors/packet-ipmi-vita.c @@ -395,12 +395,12 @@ static gint * const ett_ipmi_vita[] = { &ett_vita_persistent_control_caps }; -static const int * bits_vita_led_color[] = { +static int * const bits_vita_led_color[] = { &hf_vita_led_color, NULL }; -static const int * bits_vita_fru_policy_bits[] = { +static int * const bits_vita_fru_policy_bits[] = { &hf_vita_fru_activation_locked, &hf_vita_fru_deactivation_locked, &hf_vita_fru_commanded_deactivation_ignored, @@ -408,7 +408,7 @@ static const int * bits_vita_fru_policy_bits[] = { NULL }; -static const int * bits_vita_persistent_control_state[] = { +static int * const bits_vita_persistent_control_state[] = { &hf_vita_persistent_control_cold, &hf_vita_persistent_control_warm, NULL @@ -778,13 +778,13 @@ static hf_register_info hf_ipmi_vita[] = { static void cmd00_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint * bits_vita_ipmc[] = { + static int * const bits_vita_ipmc[] = { &hf_vita_tier, &hf_vita_layer, NULL }; - static const gint * bits_vita_ipmb[] = { + static int * const bits_vita_ipmb[] = { &hf_vita_ipmb_itfs, &hf_vita_ipmb_freq, NULL }; - static const gint * bits_vita_vso[] = { + static int * const bits_vita_vso[] = { &hf_vita_vso_std, NULL }; @@ -885,13 +885,13 @@ cmd06_rq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void cmd06_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const gint * bits_vita_led_caps[] = { + static int * const bits_vita_led_caps[] = { &hf_vita_led_cap_white, &hf_vita_led_cap_orange, &hf_vita_led_cap_amber, &hf_vita_led_cap_green, &hf_vita_led_cap_red, &hf_vita_led_cap_blue, NULL }; - static const int * bits_vita_led_flags[] = { + static int * const bits_vita_led_flags[] = { &hf_vita_led_flag_pwr, &hf_vita_led_flag_hw_restrict, NULL @@ -925,7 +925,7 @@ cmd07_rq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void cmd08_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * bits_vita_led_states[] = { + static int * const bits_vita_led_states[] = { &hf_vita_led_state_local, &hf_vita_led_state_override, &hf_vita_led_state_lamp_test, @@ -954,7 +954,7 @@ cmd08_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void cmd09_rq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * bits_vita_ipmb_state[] = { + static int * const bits_vita_ipmb_state[] = { &hf_vita_ipmb_state, &hf_vita_ipmb_link_id, NULL @@ -1011,7 +1011,7 @@ cmd0D_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void cmd14_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * bits_vita_fan_properties[] = { + static int * const bits_vita_fan_properties[] = { &hf_vita_fan_prop_local_control, NULL }; @@ -1119,7 +1119,7 @@ cmd1D_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void cmd1E_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * bits_vita_fru_control_caps[] = { + static int * const bits_vita_fru_control_caps[] = { &hf_vita_fru_control_cap_cold, &hf_vita_fru_control_cap_warm, &hf_vita_fru_control_cap_grace, @@ -1184,7 +1184,7 @@ static void cmd21_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_item * item; - static const int * bits_vita_chassis_addr_type[] = { + static int * const bits_vita_chassis_addr_type[] = { &hf_vita_chassis_addr_chmc, &hf_vita_chassis_addr_format, NULL @@ -1238,7 +1238,7 @@ cmd42_rq(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) static void cmd43_rs(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * bits_vita_persistent_control_caps[] = { + static int * const bits_vita_persistent_control_caps[] = { &hf_vita_persistent_control_cap_cold, &hf_vita_persistent_control_cap_warm, NULL diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 69d08df664..c106a41cba 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1093,7 +1093,7 @@ dissect_routing6_srh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * gint srh_first_seg, srh_addr_count; const ws_in6_addr *addr; proto_tree *rthdr_srh_addr_tree; - static const int *srh_flags[] = { + static int * const srh_flags[] = { &hf_ipv6_routing_srh_flag_unused1, &hf_ipv6_routing_srh_flag_p, &hf_ipv6_routing_srh_flag_o, @@ -1385,7 +1385,7 @@ static gint dissect_opt_rpl(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *opt_tree, struct opt_proto_item *opt_ti, guint8 opt_len) { - static const int *rpl_flags[] = { + static int * const rpl_flags[] = { &hf_ipv6_opt_rpl_flag_o, &hf_ipv6_opt_rpl_flag_r, &hf_ipv6_opt_rpl_flag_f, @@ -1830,7 +1830,7 @@ static gint dissect_opt_mpl(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *opt_tree, struct opt_proto_item *opt_ti _U_, guint8 opt_len _U_) { - static const int *mpl_flags[] = { + static int * const mpl_flags[] = { &hf_ipv6_opt_mpl_flag_s, &hf_ipv6_opt_mpl_flag_m, &hf_ipv6_opt_mpl_flag_v, @@ -1872,7 +1872,7 @@ static gint dissect_opt_dff(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *opt_tree, struct opt_proto_item *opt_ti, guint8 opt_len) { - static const int *dff_flags[] = { + static int * const dff_flags[] = { &hf_ipv6_opt_dff_flag_ver, &hf_ipv6_opt_dff_flag_dup, &hf_ipv6_opt_dff_flag_ret, diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index d43fa8ac8e..5ba58334ab 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -589,7 +589,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) spx_msg_string = val_to_str_const((conn_ctrl & 0xf0), conn_vals, "Unknown" ); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", spx_msg_string); if (tree) { - const int * spx_flags[] = { + static int * const spx_flags[] = { &hf_spx_connection_control_sys, &hf_spx_connection_control_send_ack, &hf_spx_connection_control_attn, @@ -597,7 +597,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) NULL }; - const int * spx_vii_flags[] = { + static int * const spx_vii_flags[] = { &hf_spx_connection_control_sys, &hf_spx_connection_control_send_ack, &hf_spx_connection_control_attn, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 035d809ccb..4c1ab48d40 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -5010,7 +5010,7 @@ dissect_notif(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto_t * Bits 1 to 5 are coded as bits 1 to 5 of octet 3 of the Service Category * information element as specified in subclause 10.5.4.33. (TS 24.008) */ - static const int * isakmp_notify_data_3gpp_emergency_call_numbers_flags[] = { + static int * const isakmp_notify_data_3gpp_emergency_call_numbers_flags[] = { &hf_isakmp_notify_data_3gpp_emergency_call_numbers_spare, &hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b5_mountain_rescue, &hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b4_marine_guard, diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 8a80f49d4e..456f378043 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -969,7 +969,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off guint32 ahsLen = tvb_get_guint8(tvb, offset + 4) * 4; { gint b = tvb_get_guint8(tvb, offset + 1); - static const int * flags[] = { + static int * const flags[] = { &hf_iscsi_SCSICommand_F, &hf_iscsi_SCSICommand_R, &hf_iscsi_SCSICommand_W, @@ -1048,7 +1048,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off immediate_data_length=offset-immediate_data_offset; } else if(opcode == ISCSI_OPCODE_SCSI_RESPONSE) { /* SCSI Response */ - static const int * flags[] = { + static int * const flags[] = { &hf_iscsi_SCSIResponse_o, &hf_iscsi_SCSIResponse_u, &hf_iscsi_SCSIResponse_O, @@ -1303,7 +1303,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off offset = handleDataSegmentAsTextKeys(iscsi_session, pinfo, ti, tvb, offset, data_segment_len, end_offset, TRUE); } else if(opcode == ISCSI_OPCODE_SCSI_DATA_OUT) { /* SCSI Data Out (write) */ - static const int * flags[] = { + static int * const flags[] = { &hf_iscsi_SCSIData_F, NULL }; @@ -1329,7 +1329,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off } else if(opcode == ISCSI_OPCODE_SCSI_DATA_IN) { /* SCSI Data In (read) */ { - const int * scsi_data_in[] = { + static int * const scsi_data_in[] = { &hf_iscsi_SCSIData_F, &hf_iscsi_SCSIData_O, &hf_iscsi_SCSIData_U, @@ -1337,7 +1337,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off NULL }; - const int * scsi_data_in_draft08[] = { + static int * const scsi_data_in_draft08[] = { &hf_iscsi_SCSIData_F, &hf_iscsi_SCSIData_A, &hf_iscsi_SCSIData_O, diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index 054563f46c..5ca26fd22c 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -84,17 +84,17 @@ static const value_string iser_flags_opcode[] = { {0, NULL}, }; -static const int *flags_fields[] = { +static int * const flags_fields[] = { &hf_iser_opcode_f, &hf_iser_WSV_f, &hf_iser_RSV_f, NULL }; -static const int *hello_flags_fields[] = { +static int * const hello_flags_fields[] = { &hf_iser_opcode_f, NULL }; -static const int *hellorply_flags_fields[] = { +static int * const hellorply_flags_fields[] = { &hf_iser_opcode_f, &hf_iser_REJ_f, NULL diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c index 9222d39dbc..41eb458736 100644 --- a/epan/dissectors/packet-isi.c +++ b/epan/dissectors/packet-isi.c @@ -1538,7 +1538,7 @@ static void dissect_isi_network_cell_info_ind(tvbuff_t *tvb, packet_info *pinfo, int offset = 0x03; guint8 pkgcount = tvb_get_guint8(tvb, 0x02); - static const int *gsm_band_fields[] = { + static int * const gsm_band_fields[] = { &hf_isi_network_gsm_band_900, &hf_isi_network_gsm_band_1800, &hf_isi_network_gsm_band_1900, diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index cd9c999d3c..d9f5be3dc8 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -517,7 +517,7 @@ dissect_hello_restart_clv(tvbuff_t *tvb, packet_info* pinfo _U_, proto_item *hold_time_item; if (length >= 1) { - static const int * flags[] = { + static int * const flags[] = { &hf_isis_hello_clv_restart_flags_sa, &hf_isis_hello_clv_restart_flags_ra, &hf_isis_hello_clv_restart_flags_rr, @@ -743,7 +743,7 @@ dissect_hello_reverse_metric_clv(tvbuff_t *tvb, packet_info* pinfo _U_, guint32 sub_length; - static const int * flags[] = { + static int * const flags[] = { &hf_isis_hello_reverse_metric_flag_reserved, &hf_isis_hello_reverse_metric_flag_u, &hf_isis_hello_reverse_metric_flag_w, diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index b50a21f164..75a92f0234 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -595,7 +595,7 @@ static const value_string isis_lsp_srv6_loc_sub_tlv_vals[] = { { 5, "SRv6 End SID"}, { 0, NULL } }; -static const int * adj_sid_flags[] = { +static int * const adj_sid_flags[] = { &hf_isis_lsp_adj_sid_family_flag, &hf_isis_lsp_adj_sid_backup_flag, &hf_isis_lsp_adj_sid_value_flag, @@ -604,26 +604,26 @@ static const int * adj_sid_flags[] = { NULL, }; -static const int * srv6_cap_flags[] = { +static int * const srv6_cap_flags[] = { &hf_isis_lsp_clv_srv6_cap_flags_o, &hf_isis_lsp_clv_srv6_cap_flags_unused, NULL, }; -static const int * srv6_locator_flags[] = { +static int * const srv6_locator_flags[] = { &hf_isis_lsp_srv6_loc_flags_d, &hf_isis_lsp_srv6_loc_flags_reserved, NULL, }; -static const int * srv6_endx_sid_flags[] = { +static int * const srv6_endx_sid_flags[] = { &hf_isis_lsp_clv_srv6_endx_sid_flags_b, &hf_isis_lsp_clv_srv6_endx_sid_flags_s, &hf_isis_lsp_clv_srv6_endx_sid_flags_p, NULL, }; -static const int * prefix_sid_flags[] = { +static int * const prefix_sid_flags[] = { &hf_isis_lsp_ext_ip_reachability_prefix_re_adv_flag, &hf_isis_lsp_ext_ip_reachability_prefix_node_sid_flag, &hf_isis_lsp_ext_ip_reachability_prefix_nophp_flag, @@ -633,7 +633,7 @@ static const int * prefix_sid_flags[] = { NULL, }; -static const int * prefix_attr_flags[] = { +static int * const prefix_attr_flags[] = { &hf_isis_lsp_prefix_attr_flags_x, &hf_isis_lsp_prefix_attr_flags_r, &hf_isis_lsp_prefix_attr_flags_n, @@ -2110,7 +2110,7 @@ dissect_isis_lsp_clv_mt_cap_spb_instance(tvbuff_t *tvb, packet_info *pinfo, const int FIXED_LEN = NUM_TREES_OFFSET + NUM_TREES_LEN; const int VLAN_ID_TUPLE_LEN = 8; - static const int *lsp_cap_spb_instance_vlanid_tuple[] = { + static int * const lsp_cap_spb_instance_vlanid_tuple[] = { &hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_u, &hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_m, &hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_a, @@ -2202,7 +2202,7 @@ dissect_isis_lsp_clv_mt_cap_spbm_service_identifier(tvbuff_t *tvb, packet_info * const int ISID_LEN = 4; - static const int *lsp_cap_spbm_service_identifier[] = { + static int * const lsp_cap_spbm_service_identifier[] = { &hf_isis_lsp_mt_cap_spbm_service_identifier_t, &hf_isis_lsp_mt_cap_spbm_service_identifier_r, &hf_isis_lsp_mt_cap_spbm_service_identifier_reserved, @@ -2253,7 +2253,7 @@ dissect_isis_lsp_clv_mt_cap_spbv_mac_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int subtype, int sublen) { - static const int *lsp_spb_short_mac_address[] = { + static int * const lsp_spb_short_mac_address[] = { &hf_isis_lsp_spb_short_mac_address_t, &hf_isis_lsp_spb_short_mac_address_r, &hf_isis_lsp_spb_short_mac_address_reserved, @@ -2393,7 +2393,7 @@ dissect_isis_lsp_clv_sid_label_binding(tvbuff_t *tvb, packet_info* pinfo, proto_ guint clv_code = 0; guint clv_len = 0; - static const int *lsp_sl_flags[] = { + static int * const lsp_sl_flags[] = { &hf_isis_lsp_sl_binding_flags_f, &hf_isis_lsp_sl_binding_flags_m, &hf_isis_lsp_sl_binding_flags_s, @@ -2403,7 +2403,7 @@ dissect_isis_lsp_clv_sid_label_binding(tvbuff_t *tvb, packet_info* pinfo, proto_ NULL }; - static const int *lsp_sl_sub_tlv_flags[] = { + static int * const lsp_sl_sub_tlv_flags[] = { &hf_isis_lsp_sl_sub_tlv_flags_r, &hf_isis_lsp_sl_sub_tlv_flags_n, &hf_isis_lsp_sl_sub_tlv_flags_p, @@ -4196,7 +4196,7 @@ dissect_isis_lsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset return; } if (tree) { - static const int * attach_flags[] = { + static int * const attach_flags[] = { &hf_isis_lsp_error_metric, &hf_isis_lsp_expense_metric, &hf_isis_lsp_delay_metric, diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index b8777cef98..c5253873cc 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -291,7 +291,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp case EDP_DEVICE_TYPE_SFS17: case EDP_DEVICE_TYPE_SFS18: { - static const gint *options[] = { + static int * const options[] = { &hf_ismp_edp_sfs_option_uplink_flood, &hf_ismp_edp_sfs_option_uplink_port, &hf_ismp_edp_sfs_option_uplink_core, @@ -314,7 +314,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp break; case EDP_DEVICE_TYPE_ROUTER: { - static const gint *options[] = { + static int * const options[] = { &hf_ismp_edp_rtr_option_level1, &hf_ismp_edp_rtr_option_trans, &hf_ismp_edp_rtr_option_route, @@ -336,7 +336,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp break; case EDP_DEVICE_TYPE_BRIDGE: { - static const gint *options[] = { + static int * const options[] = { &hf_ismp_edp_switch_option_level1, &hf_ismp_edp_switch_option_trans, &hf_ismp_edp_switch_option_route, @@ -357,7 +357,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp case EDP_DEVICE_TYPE_UNIXSERVER: case EDP_DEVICE_TYPE_UNIXCLIENT: { - static const gint *options[] = { + static int * const options[] = { &hf_ismp_edp_end_station_option_ad, &hf_ismp_edp_end_station_option_dns, &hf_ismp_edp_end_station_option_dhcp, diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 827271b004..3ee9d5891e 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -552,7 +552,7 @@ dissect_isns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint16 flags; proto_tree *tt = NULL; proto_item *tpayload; - static const int * isns_flags[] = { + static int * const isns_flags[] = { &hf_isns_client, &hf_isns_server, &hf_isns_auth, @@ -785,7 +785,7 @@ dissect_isns_attr_port(tvbuff_t *tvb, guint offset, proto_tree *tree, int hf_ind static void dissect_isns_attr_iscsi_node_type(tvbuff_t *tvb, guint offset, proto_tree *tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_isns_isnt_control, &hf_isns_isnt_initiator, &hf_isns_isnt_target, @@ -801,7 +801,7 @@ dissect_isns_attr_iscsi_node_type(tvbuff_t *tvb, guint offset, proto_tree *tree) static void dissect_isns_attr_portal_security_bitmap(tvbuff_t *tvb, guint offset, proto_tree *tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_isns_psb_tunnel_mode, &hf_isns_psb_transport_mode, &hf_isns_psb_pfs, @@ -830,7 +830,7 @@ dissect_isns_attr_scn_bitmap(tvbuff_t *tvb, guint offset, proto_tree *tree) 30 DD/DDS MEMBER REMOVED (Mgmt Reg/SCN only) 31 (Lsb) DD/DDS MEMBER ADDED (Mgmt Reg/SCN only) */ - static const int * flags[] = { + static int * const flags[] = { &hf_isns_scn_bitmap_initiator_and_self_information_only, &hf_isns_scn_bitmap_target_and_self_information_only, &hf_isns_scn_bitmap_management_registration_scn, diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 19551e2ef1..62747287c6 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -315,7 +315,7 @@ static int hf_iso14443_write_block = -1; static int hf_iso14443_write_block_number = -1; static int hf_iso14443_write_block_data = -1; -static const int *bit_rate_fields[] = { +static int * const bit_rate_fields[] = { &hf_iso14443_same_bit_rate, &hf_iso14443_picc_pcd_847, &hf_iso14443_picc_pcd_424, @@ -326,7 +326,7 @@ static const int *bit_rate_fields[] = { NULL }; -static const int *ats_ta1_fields[] = { +static int * const ats_ta1_fields[] = { &hf_iso14443_same_d, &hf_iso14443_ds8, &hf_iso14443_ds4, diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 4dcb0979ef..b944f2e276 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3257,7 +3257,7 @@ static void dissect_isup_nature_of_connection_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 nature_of_connection_ind; - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_satellite_indicator, &hf_isup_continuity_check_indicator, &hf_isup_echo_control_device_indicator, @@ -3277,7 +3277,7 @@ static void dissect_isup_forward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 forward_call_ind = tvb_get_ntohs(parameter_tvb, 0); - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_forw_call_natnl_inatnl_call_indicator, &hf_isup_forw_call_end_to_end_method_indicator, &hf_isup_forw_call_interworking_indicator, @@ -3452,13 +3452,13 @@ dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, packet_info guint8 indicators1, indicators2; gint offset = 0; gint number_plan; - static const int *indicators1_flags[] = { + static int * const indicators1_flags[] = { &hf_isup_odd_even_indicator, &hf_isup_called_party_nature_of_address_indicator, NULL }; - static const int *indicators2_flags[] = { + static int * const indicators2_flags[] = { &hf_isup_inn_indicator, &hf_isup_numbering_plan_indicator, NULL @@ -3502,7 +3502,7 @@ dissect_isup_subsequent_number_parameter(tvbuff_t *parameter_tvb, packet_info *p static void dissect_isup_information_request_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_calling_party_address_request_indicator, &hf_isup_info_req_holding_indicator, &hf_isup_calling_partys_category_request_indicator, @@ -3521,7 +3521,7 @@ dissect_isup_information_request_indicators_parameter(tvbuff_t *parameter_tvb, p static void dissect_isup_information_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_calling_party_address_response_indicator, &hf_isup_hold_provided_indicator, &hf_isup_calling_partys_category_response_indicator, @@ -3553,7 +3553,7 @@ dissect_isup_continuity_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree static void dissect_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_backw_call_charge_ind, &hf_isup_backw_call_called_partys_status_ind, &hf_isup_backw_call_called_partys_category_ind, @@ -3575,7 +3575,7 @@ dissect_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_t static void dissect_ansi_isup_backward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_backw_call_charge_ind, &hf_isup_backw_call_called_partys_status_ind, &hf_isup_backw_call_called_partys_category_ind, @@ -3961,7 +3961,7 @@ dissect_ansi_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, p { gint offset = 0; - static const int * indicators_fields[] = { + static int * const indicators_fields[] = { &hf_ansi_isup_spare_b7, &hf_isup_type_of_network_identification, &hf_ansi_isup_tns_nw_id_plan, @@ -3999,7 +3999,7 @@ dissect_ansi_isup_param_carrier_id(tvbuff_t *parameter_tvb, packet_info *pinfo _ { int offset = 0; - static const int * flags[] = { + static int * const flags[] = { &hf_ansi_isup_spare_b7, &hf_ansi_isup_type_of_nw_id, &hf_ansi_isup_nw_id_plan, @@ -4640,7 +4640,7 @@ static const value_string BAT_ASE_Report_Reason_vals[] = { */ extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int len) { guint8 tempdata; - static const int * active_code_sets[] = { + static int * const active_code_sets[] = { &hf_active_code_set_12_2, &hf_active_code_set_10_2, &hf_active_code_set_7_95, @@ -4652,7 +4652,7 @@ extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int l NULL }; - static const int * supported_code_sets[] = { + static int * const supported_code_sets[] = { &hf_supported_code_set_12_2, &hf_supported_code_set_10_2, &hf_supported_code_set_7_95, @@ -4742,7 +4742,7 @@ static int dissect_codec(tvbuff_t *parameter_tvb, proto_tree *bat_ase_element_tree, gint length_indicator, gint offset, gint identifier) { /* offset is at length indicator e.g 1 step past identifier */ - static const int * compatibility_info[] = { + static int * const compatibility_info[] = { &hf_Instruction_ind_for_general_action, &hf_Send_notification_ind_for_general_action, &hf_Instruction_ind_for_pass_on_not_possible, @@ -5087,21 +5087,21 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf tvbuff_t *next_tvb = NULL; fragment_head *frag_msg = NULL; - static const int * apm_flags[] = { + static int * const apm_flags[] = { &hf_isup_extension_ind, &hf_isup_apm_si_ind, &hf_isup_apm_segmentation_ind, NULL }; - static const int * app_trans_flags[] = { + static int * const app_trans_flags[] = { &hf_isup_extension_ind, &hf_isup_app_Send_notification_ind, &hf_isup_app_Release_call_ind, NULL }; - static const int * app_field_flags[] = { + static int * const app_field_flags[] = { &hf_isup_extension_ind, &hf_isup_app_cont_ident, NULL @@ -5258,7 +5258,7 @@ static void dissect_isup_optional_forward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 ind; - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_cug_call_ind, &hf_isup_simple_segmentation_ind, &hf_isup_connected_line_identity_request_ind, @@ -5281,12 +5281,12 @@ dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, packet_info guint8 indicators1, indicators2; gint offset = 0; gint number_plan; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL }; - static const int * indicators2_fields[] = { + static int * const indicators2_fields[] = { &hf_isup_ni_indicator, &hf_isup_numbering_plan_indicator, &hf_isup_address_presentation_restricted_indicator, @@ -5315,12 +5315,12 @@ dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_in { guint8 indicators1; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL }; - static const int * indicators2_fields[] = { + static int * const indicators2_fields[] = { &hf_isup_numbering_plan_indicator, &hf_isup_address_presentation_restricted_indicator, NULL @@ -5346,12 +5346,12 @@ dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, packet_info * { guint8 indicators1; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL }; - static const int * indicators2_fields[] = { + static int * const indicators2_fields[] = { &hf_isup_numbering_plan_indicator, &hf_isup_address_presentation_restricted_indicator, NULL @@ -5376,12 +5376,12 @@ dissect_isup_redirection_number_parameter(tvbuff_t *parameter_tvb, packet_info * { guint8 indicators1; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_called_party_nature_of_address_indicator, NULL }; - static const int * indicators2_fields[] = { + static int * const indicators2_fields[] = { &hf_isup_inn_indicator, &hf_isup_numbering_plan_indicator, NULL @@ -5500,12 +5500,12 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, packet_info *pi { guint8 indicators1; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL }; - static const int * indicators2_fields[] = { + static int * const indicators2_fields[] = { &hf_isup_numbering_plan_indicator, &hf_isup_address_presentation_restricted_indicator, &hf_isup_screening_indicator, @@ -5531,7 +5531,7 @@ dissect_isup_transit_network_selection_parameter(tvbuff_t *parameter_tvb, packet { guint8 indicators1; gint offset = 0; - static const int * indicators_fields[] = { + static int * const indicators_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_type_of_network_identification, &hf_isup_network_identification_plan, @@ -5577,7 +5577,7 @@ dissect_isup_automatic_congestion_level_parameter(tvbuff_t *parameter_tvb, proto static void dissect_isup_optional_backward_call_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_inband_information_ind, &hf_isup_call_diversion_may_occur_ind, &hf_isup_simple_segmentation_ind, @@ -5622,14 +5622,14 @@ dissect_isup_user_to_user_indicators_parameter(tvbuff_t *parameter_tvb, proto_item *parameter_item) { guint8 indicators; - static const int * req_fields[] = { + static int * const req_fields[] = { &hf_isup_UUI_type, &hf_isup_UUI_req_service1, &hf_isup_UUI_req_service2, &hf_isup_UUI_req_service3, NULL }; - static const int * res_fields[] = { + static int * const res_fields[] = { &hf_isup_UUI_type, &hf_isup_UUI_res_service1, &hf_isup_UUI_res_service2, @@ -5919,7 +5919,7 @@ static const value_string IECD_req_ind_vals[] = { static void dissect_isup_echo_control_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint8 indicator; - static const int * info[] = { + static int * const info[] = { &hf_isup_OECD_inf_ind, &hf_isup_IECD_inf_ind, &hf_isup_OECD_req_ind, @@ -5946,7 +5946,7 @@ dissect_isup_message_compatibility_information_parameter(tvbuff_t *parameter_tvb { gint offset = 0; - static const int * params[] = { + static int * const params[] = { &hf_isup_transit_at_intermediate_exchange_ind, &hf_isup_Release_call_ind, &hf_isup_Send_notification_ind, @@ -6002,7 +6002,7 @@ dissect_isup_parameter_compatibility_information_parameter(tvbuff_t *parameter_t guint8 offset; guint8 instruction_indicators; - static const int * indicator_flags[] = { + static int * const indicator_flags[] = { &hf_isup_transit_at_intermediate_exchange_ind, &hf_isup_Release_call_ind, &hf_isup_Send_notification_ind, @@ -6176,7 +6176,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, packet_info *pin { guint8 indicators1, indicators2; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL @@ -6413,12 +6413,12 @@ dissect_isup_called_in_number_parameter(tvbuff_t *parameter_tvb, packet_info *pi { guint8 indicators1; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL }; - static const int * indicators2_fields[] = { + static int * const indicators2_fields[] = { &hf_isup_numbering_plan_indicator, &hf_isup_address_presentation_restricted_indicator, NULL @@ -6608,7 +6608,7 @@ dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinf { guint8 indicators1, indicators2; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_calling_party_nature_of_address_indicator, NULL @@ -6667,7 +6667,7 @@ dissect_isup_generic_name_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet { gint gen_name_length; char *gen_name = NULL; - static const int * indicators[] = { + static int * const indicators[] = { &hf_isup_generic_name_presentation, &hf_isup_generic_name_availability, &hf_isup_generic_name_type, @@ -6704,7 +6704,7 @@ dissect_isup_charge_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo { guint8 indicators1; gint offset = 0; - static const int * indicators1_fields[] = { + static int * const indicators1_fields[] = { &hf_isup_odd_even_indicator, &hf_isup_charge_number_nature_of_address_indicator, NULL diff --git a/epan/dissectors/packet-its.c b/epan/dissectors/packet-its.c index abddca944c..4c2ee9e209 100644 --- a/epan/dissectors/packet-its.c +++ b/epan/dissectors/packet-its.c @@ -213,7 +213,7 @@ static int dissect_regextval_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static int dissect_denmssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - static const int *denmssp_flags[] = { + static int * const denmssp_flags[] = { &hf_denmssp_trafficCondition, &hf_denmssp_accident, &hf_denmssp_roadworks, @@ -252,7 +252,7 @@ static int dissect_denmssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static int dissect_camssp_pdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { - static const int *camssp_flags[] = { + static int * const camssp_flags[] = { &hf_camssp_cenDsrcTollingZone, &hf_camssp_publicTransport, &hf_camssp_specialTransport, @@ -2669,7 +2669,7 @@ dissect_its_PtActivation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const int * its_AccelerationControl_bits[] = { +static int * const its_AccelerationControl_bits[] = { &hf_its_AccelerationControl_brakePedalEngaged, &hf_its_AccelerationControl_gasPedalEngaged, &hf_its_AccelerationControl_emergencyBrakeEngaged, @@ -3459,7 +3459,7 @@ dissect_its_StationType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * its_ExteriorLights_bits[] = { +static int * const its_ExteriorLights_bits[] = { &hf_its_ExteriorLights_lowBeamHeadlightsOn, &hf_its_ExteriorLights_highBeamHeadlightsOn, &hf_its_ExteriorLights_leftTurnSignalOn, @@ -3584,7 +3584,7 @@ dissect_its_DangerousGoodsExtended(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * its_SpecialTransportType_bits[] = { +static int * const its_SpecialTransportType_bits[] = { &hf_its_SpecialTransportType_heavyLoad, &hf_its_SpecialTransportType_excessWidth, &hf_its_SpecialTransportType_excessLength, @@ -3601,7 +3601,7 @@ dissect_its_SpecialTransportType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const int * its_LightBarSirenInUse_bits[] = { +static int * const its_LightBarSirenInUse_bits[] = { &hf_its_LightBarSirenInUse_lightBarActivated, &hf_its_LightBarSirenInUse_sirenActivated, NULL @@ -3812,7 +3812,7 @@ dissect_its_PosFrontAx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * its_PositionOfOccupants_bits[] = { +static int * const its_PositionOfOccupants_bits[] = { &hf_its_PositionOfOccupants_row1LeftOccupied, &hf_its_PositionOfOccupants_row1RightOccupied, &hf_its_PositionOfOccupants_row1MidOccupied, @@ -3900,7 +3900,7 @@ dissect_its_VehicleIdentification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * its_EnergyStorageType_bits[] = { +static int * const its_EnergyStorageType_bits[] = { &hf_its_EnergyStorageType_hydrogenStorage, &hf_its_EnergyStorageType_electricEnergyStorage, &hf_its_EnergyStorageType_liquidPropaneGas, @@ -4002,7 +4002,7 @@ dissect_its_PathHistory(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * its_EmergencyPriority_bits[] = { +static int * const its_EmergencyPriority_bits[] = { &hf_its_EmergencyPriority_requestForRightOfWay, &hf_its_EmergencyPriority_requestForFreeCrossingAtATrafficLight, NULL @@ -4854,7 +4854,7 @@ dissect_itsv1_PtActivation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * itsv1_AccelerationControl_bits[] = { +static int * const itsv1_AccelerationControl_bits[] = { &hf_itsv1_AccelerationControl_brakePedalEngaged, &hf_itsv1_AccelerationControl_gasPedalEngaged, &hf_itsv1_AccelerationControl_emergencyBrakeEngaged, @@ -5099,7 +5099,7 @@ dissect_itsv1_HardShoulderStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const int * itsv1_DrivingLaneStatus_bits[] = { +static int * const itsv1_DrivingLaneStatus_bits[] = { &hf_itsv1_DrivingLaneStatus_spare_bit0, &hf_itsv1_DrivingLaneStatus_outermostLaneClosed, &hf_itsv1_DrivingLaneStatus_secondLaneFromOutsideClosed, @@ -5379,7 +5379,7 @@ dissect_itsv1_StationType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const int * itsv1_ExteriorLights_bits[] = { +static int * const itsv1_ExteriorLights_bits[] = { &hf_itsv1_ExteriorLights_lowBeamHeadlightsOn, &hf_itsv1_ExteriorLights_highBeamHeadlightsOn, &hf_itsv1_ExteriorLights_leftTurnSignalOn, @@ -5494,7 +5494,7 @@ dissect_itsv1_DangerousGoodsExtended(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * itsv1_SpecialTransportType_bits[] = { +static int * const itsv1_SpecialTransportType_bits[] = { &hf_itsv1_SpecialTransportType_heavyLoad, &hf_itsv1_SpecialTransportType_excessWidth, &hf_itsv1_SpecialTransportType_excessLength, @@ -5511,7 +5511,7 @@ dissect_itsv1_SpecialTransportType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * itsv1_LightBarSirenInUse_bits[] = { +static int * const itsv1_LightBarSirenInUse_bits[] = { &hf_itsv1_LightBarSirenInUse_lightBarActivated, &hf_itsv1_LightBarSirenInUse_sirenActivated, NULL @@ -5722,7 +5722,7 @@ dissect_itsv1_PosFrontAx(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const int * itsv1_PositionOfOccupants_bits[] = { +static int * const itsv1_PositionOfOccupants_bits[] = { &hf_itsv1_PositionOfOccupants_row1LeftOccupied, &hf_itsv1_PositionOfOccupants_row1RightOccupied, &hf_itsv1_PositionOfOccupants_row1MidOccupied, @@ -5810,7 +5810,7 @@ dissect_itsv1_VehicleIdentification(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } -static const int * itsv1_EnergyStorageType_bits[] = { +static int * const itsv1_EnergyStorageType_bits[] = { &hf_itsv1_EnergyStorageType_hydrogenStorage, &hf_itsv1_EnergyStorageType_electricEnergyStorage, &hf_itsv1_EnergyStorageType_liquidPropaneGas, @@ -5912,7 +5912,7 @@ dissect_itsv1_PathHistory(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const int * itsv1_EmergencyPriority_bits[] = { +static int * const itsv1_EmergencyPriority_bits[] = { &hf_itsv1_EmergencyPriority_requestForRightOfWay, &hf_itsv1_EmergencyPriority_requestForFreeCrossingAtATrafficLight, NULL @@ -7949,7 +7949,7 @@ dissect_ivi_T_month_day(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * ivi_PMD_bits[] = { +static int * const ivi_PMD_bits[] = { &hf_ivi_PMD_national_holiday, &hf_ivi_PMD_even_days, &hf_ivi_PMD_odd_days, @@ -8016,7 +8016,7 @@ dissect_ivi_T_hourMinutes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const int * ivi_DayOfWeek_bits[] = { +static int * const ivi_DayOfWeek_bits[] = { &hf_ivi_DayOfWeek_unused, &hf_ivi_DayOfWeek_monday, &hf_ivi_DayOfWeek_tuesday, @@ -9550,7 +9550,7 @@ dissect_dsrc_ApproachID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * dsrc_LaneDirection_bits[] = { +static int * const dsrc_LaneDirection_bits[] = { &hf_dsrc_LaneDirection_ingressPath, &hf_dsrc_LaneDirection_egressPath, NULL @@ -9565,7 +9565,7 @@ dissect_dsrc_LaneDirection(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * dsrc_LaneSharing_bits[] = { +static int * const dsrc_LaneSharing_bits[] = { &hf_dsrc_LaneSharing_overlappingLaneDescriptionProvided, &hf_dsrc_LaneSharing_multipleLanesTreatedAsOneLane, &hf_dsrc_LaneSharing_otherNonMotorizedTrafficTypes, @@ -9588,7 +9588,7 @@ dissect_dsrc_LaneSharing(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const int * dsrc_LaneAttributes_Vehicle_bits[] = { +static int * const dsrc_LaneAttributes_Vehicle_bits[] = { &hf_dsrc_LaneAttributes_Vehicle_isVehicleRevocableLane, &hf_dsrc_LaneAttributes_Vehicle_isVehicleFlyOverLane, &hf_dsrc_LaneAttributes_Vehicle_hovLaneUseOnly, @@ -9609,7 +9609,7 @@ dissect_dsrc_LaneAttributes_Vehicle(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } -static const int * dsrc_LaneAttributes_Crosswalk_bits[] = { +static int * const dsrc_LaneAttributes_Crosswalk_bits[] = { &hf_dsrc_LaneAttributes_Crosswalk_crosswalkRevocableLane, &hf_dsrc_LaneAttributes_Crosswalk_bicyleUseAllowed, &hf_dsrc_LaneAttributes_Crosswalk_isXwalkFlyOverLane, @@ -9631,7 +9631,7 @@ dissect_dsrc_LaneAttributes_Crosswalk(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const int * dsrc_LaneAttributes_Bike_bits[] = { +static int * const dsrc_LaneAttributes_Bike_bits[] = { &hf_dsrc_LaneAttributes_Bike_bikeRevocableLane, &hf_dsrc_LaneAttributes_Bike_pedestrianUseAllowed, &hf_dsrc_LaneAttributes_Bike_isBikeFlyOverLane, @@ -9651,7 +9651,7 @@ dissect_dsrc_LaneAttributes_Bike(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const int * dsrc_LaneAttributes_Sidewalk_bits[] = { +static int * const dsrc_LaneAttributes_Sidewalk_bits[] = { &hf_dsrc_LaneAttributes_Sidewalk_sidewalk_RevocableLane, &hf_dsrc_LaneAttributes_Sidewalk_bicyleUseAllowed, &hf_dsrc_LaneAttributes_Sidewalk_isSidewalkFlyOverLane, @@ -9668,7 +9668,7 @@ dissect_dsrc_LaneAttributes_Sidewalk(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * dsrc_LaneAttributes_Barrier_bits[] = { +static int * const dsrc_LaneAttributes_Barrier_bits[] = { &hf_dsrc_LaneAttributes_Barrier_median_RevocableLane, &hf_dsrc_LaneAttributes_Barrier_median, &hf_dsrc_LaneAttributes_Barrier_whiteLineHashing, @@ -9691,7 +9691,7 @@ dissect_dsrc_LaneAttributes_Barrier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } -static const int * dsrc_LaneAttributes_Striping_bits[] = { +static int * const dsrc_LaneAttributes_Striping_bits[] = { &hf_dsrc_LaneAttributes_Striping_stripeToConnectingLanesRevocableLane, &hf_dsrc_LaneAttributes_Striping_stripeDrawOnLeft, &hf_dsrc_LaneAttributes_Striping_stripeDrawOnRight, @@ -9710,7 +9710,7 @@ dissect_dsrc_LaneAttributes_Striping(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * dsrc_LaneAttributes_TrackedVehicle_bits[] = { +static int * const dsrc_LaneAttributes_TrackedVehicle_bits[] = { &hf_dsrc_LaneAttributes_TrackedVehicle_spec_RevocableLane, &hf_dsrc_LaneAttributes_TrackedVehicle_spec_commuterRailRoadTrack, &hf_dsrc_LaneAttributes_TrackedVehicle_spec_lightRailRoadTrack, @@ -9728,7 +9728,7 @@ dissect_dsrc_LaneAttributes_TrackedVehicle(tvbuff_t *tvb _U_, int offset _U_, as } -static const int * dsrc_LaneAttributes_Parking_bits[] = { +static int * const dsrc_LaneAttributes_Parking_bits[] = { &hf_dsrc_LaneAttributes_Parking_parkingRevocableLane, &hf_dsrc_LaneAttributes_Parking_parallelParkingInUse, &hf_dsrc_LaneAttributes_Parking_headInParkingInUse, @@ -9806,7 +9806,7 @@ dissect_dsrc_LaneAttributes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * dsrc_AllowedManeuvers_bits[] = { +static int * const dsrc_AllowedManeuvers_bits[] = { &hf_dsrc_AllowedManeuvers_maneuverStraightAllowed, &hf_dsrc_AllowedManeuvers_maneuverLeftAllowed, &hf_dsrc_AllowedManeuvers_maneuverRightAllowed, @@ -11408,7 +11408,7 @@ dissect_dsrc_FullPositionVector(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -static const int * dsrc_GNSSstatus_bits[] = { +static int * const dsrc_GNSSstatus_bits[] = { &hf_dsrc_GNSSstatus_unavailable, &hf_dsrc_GNSSstatus_isHealthy, &hf_dsrc_GNSSstatus_isMonitored, @@ -11535,7 +11535,7 @@ dissect_dsrc_RTCMcorrections(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * dsrc_IntersectionStatusObject_bits[] = { +static int * const dsrc_IntersectionStatusObject_bits[] = { &hf_dsrc_IntersectionStatusObject_manualControlIsEnabled, &hf_dsrc_IntersectionStatusObject_stopTimeIsActivated, &hf_dsrc_IntersectionStatusObject_failureFlash, @@ -12350,7 +12350,7 @@ dissect_dsrc_RequestorPositionVector(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * dsrc_TransitVehicleStatus_bits[] = { +static int * const dsrc_TransitVehicleStatus_bits[] = { &hf_dsrc_TransitVehicleStatus_loading, &hf_dsrc_TransitVehicleStatus_anADAuse, &hf_dsrc_TransitVehicleStatus_aBikeLoad, @@ -14401,7 +14401,7 @@ dissect_tistpg_CustomerContract(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -static const int * tistpg_TisProfile_bits[] = { +static int * const tistpg_TisProfile_bits[] = { &hf_tistpg_TisProfile_reserved, &hf_tistpg_TisProfile_profileOne, &hf_tistpg_TisProfile_profileTwo, @@ -14536,7 +14536,7 @@ dissect_tistpg_TisTpgSNM_Management(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } -static const int * tistpg_TpgAutomation_bits[] = { +static int * const tistpg_TpgAutomation_bits[] = { &hf_tistpg_TpgAutomation_fullAutomated, &hf_tistpg_TpgAutomation_semiAutomated, &hf_tistpg_TpgAutomation_manual, @@ -15548,7 +15548,7 @@ dissect_evcsn_NumericString_SIZE_1_16(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const int * evcsn_ChargingSpotType_bits[] = { +static int * const evcsn_ChargingSpotType_bits[] = { &hf_evcsn_ChargingSpotType_standardChargeMode1, &hf_evcsn_ChargingSpotType_standardChargeMode2, &hf_evcsn_ChargingSpotType_standardOrFastChargeMode3, @@ -15923,7 +15923,7 @@ dissect_evrsr_AvailabilityStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const int * evrsr_SupportedPaymentTypes_bits[] = { +static int * const evrsr_SupportedPaymentTypes_bits[] = { &hf_evrsr_SupportedPaymentTypes_contract, &hf_evrsr_SupportedPaymentTypes_externalIdentification, NULL diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 64b90e28a5..223e6c77b3 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -476,7 +476,7 @@ static int hf_radiotap_vw_info_rx_layer_1_info_1 = -1; static int hf_radiotap_vw_info_rx_vht_frame_received_with_vht_sig_b_length = -1; static int hf_radiotap_vw_info_rx_vht_frame_received_without_vht_sig_b_length = -1; static int hf_radiotap_vw_info_rx_factory_internal = -1; -static const int *radiotap_info_rx_fields[] = { +static int * const radiotap_info_rx_fields[] = { &hf_radiotap_vw_info_rx_crypto_wep_encoded, &hf_radiotap_vw_info_rx_crypto_tkip_encoded, &hf_radiotap_vw_info_rx_crypto_rx_tkip_tsc_seqskip, @@ -516,7 +516,7 @@ static int hf_radiotap_vw_info_tx_last_mpdu_of_a_mpdu = -1; static int hf_radiotap_vw_info_tx_msdu_of_a_msdu = -1; static int hf_radiotap_vw_info_tx_first_msdu_of_a_msdu = -1; static int hf_radiotap_vw_info_tx_last_msdu_of_a_msdu = -1; -static const int *radiotap_info_tx_fields[] = { +static int * const radiotap_info_tx_fields[] = { &hf_radiotap_vw_info_tx_crypto_wep_encoded, &hf_radiotap_vw_info_tx_crypto_tkip_encoded, &hf_radiotap_vw_info_tx_crypto_c_bit_error, @@ -621,7 +621,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da int ifg_flag = 0; proto_tree *vwrft, *vw_rfinfo_tree = NULL, *rfinfo_contextp_tree; - static const int * context_a_flags[] = { + static int * const context_a_flags[] = { &hf_radiotap_rfinfo_contextpA_snr_noise_valid, &hf_radiotap_rfinfo_contextpA_pfe_valid, &hf_radiotap_rfinfo_contextpA_pfe_is_cck, @@ -636,7 +636,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da &hf_radiotap_rfinfo_contextpA_qam_modulation, NULL }; - static const int * context_b_flags[] = { + static int * const context_b_flags[] = { &hf_radiotap_rfinfo_contextpB_snr_noise_valid, &hf_radiotap_rfinfo_contextpB_pfe_valid, &hf_radiotap_rfinfo_contextpB_pfe_is_cck, @@ -651,7 +651,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da &hf_radiotap_rfinfo_contextpB_qam_modulation, NULL }; - static const int * context_c_flags[] = { + static int * const context_c_flags[] = { &hf_radiotap_rfinfo_contextpC_snr_noise_valid, &hf_radiotap_rfinfo_contextpC_pfe_valid, &hf_radiotap_rfinfo_contextpC_pfe_is_cck, @@ -666,7 +666,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da &hf_radiotap_rfinfo_contextpC_qam_modulation, NULL }; - static const int * context_d_flags[] = { + static int * const context_d_flags[] = { &hf_radiotap_rfinfo_contextpD_snr_noise_valid, &hf_radiotap_rfinfo_contextpD_pfe_valid, &hf_radiotap_rfinfo_contextpD_pfe_is_cck, @@ -1563,7 +1563,7 @@ ethernettap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_t if (length_remaining >= 4) { if (vwf_txf == 0) { /* then it's an rx case */ - static const int * vw_error_rx_flags[] = { + static int * const vw_error_rx_flags[] = { &hf_ixveriwave_vw_error_1_alignment_error, &hf_ixveriwave_vw_error_1_packet_fcs_error, &hf_ixveriwave_vw_error_1_bad_magic_byte_signature, @@ -1580,7 +1580,7 @@ ethernettap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_t proto_tree_add_bitmask(tap_tree, tvb, offset, hf_ixveriwave_vw_error, ett_ethernettap_error, vw_error_rx_flags, ENC_LITTLE_ENDIAN); } else { /* it's a tx case */ - static const int * vw_error_tx_flags[] = { + static int * const vw_error_tx_flags[] = { &hf_ixveriwave_vw_error_1_packet_fcs_error, &hf_ixveriwave_vw_error_1_ip_checksum_error, &hf_ixveriwave_vw_error_1_underflow, @@ -2128,7 +2128,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* info */ if (!(vw_flags & VW_RADIOTAPF_TXF)) { /* then it's an rx case */ /*FPGA_VER_vVW510021 version decodes */ - static const int * vw_info_rx_2_flags[] = { + static int * const vw_info_rx_2_flags[] = { &hf_radiotap_vw_info_2_ack_withheld_from_frame, &hf_radiotap_vw_info_2_sent_cts_to_self_before_data, &hf_radiotap_vw_info_2_mpdu_of_a_mpdu, @@ -2143,7 +2143,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_bitmask(tap_tree, tvb, offset, hf_radiotap_vw_info, ett_radiotap_info, vw_info_rx_2_flags, ENC_LITTLE_ENDIAN); } else { /* it's a tx case */ - static const int * vw_info_tx_2_flags[] = { + static int * const vw_info_tx_2_flags[] = { &hf_radiotap_vw_info_2_mpdu_of_a_mpdu, &hf_radiotap_vw_info_2_first_mpdu_of_a_mpdu, &hf_radiotap_vw_info_2_last_pdu_of_a_mpdu, @@ -2878,7 +2878,7 @@ wlantap_dissect_octo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* the error flags field is only 16 bits (instead of 32) to save space */ if (cmd_type != 1) { /* then it's an rx case */ - static const int * vw_errors_rx_flags[] = { + static int * const vw_errors_rx_flags[] = { &hf_radiotap_vw_errors_rx_sig_field_crc_parity_error, &hf_radiotap_vw_errors_rx_non_supported_service_field, &hf_radiotap_vw_errors_rx_frame_length_error, @@ -2910,7 +2910,7 @@ wlantap_dissect_octo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_bitmask(vw_l2l4info_tree, tvb, offset, hf_radiotap_vw_errors, ett_radiotap_errors, vw_errors_rx_flags, ENC_LITTLE_ENDIAN); } else { /* it's a tx case */ - static const int * vw_errors_tx_flags[] = { + static int * const vw_errors_tx_flags[] = { &hf_radiotap_vw_errors_tx_2_crc32_error, &hf_radiotap_vw_errors_tx_2_ip_checksum_error, &hf_radiotap_vw_errors_tx_2_ack_timeout, diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index 17b005e8d2..a82ca6dc99 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -451,7 +451,7 @@ static const value_string juniper_proto_vals[] = { {0, NULL} }; -static const int * vn_flags[] = { +static int * const vn_flags[] = { &hf_juniper_vn_flag_direction, &hf_juniper_vn_flag_mirror, &hf_juniper_vn_flag_reject, diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 883aa9e343..1e91a4ca7b 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -1384,7 +1384,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree tree_offset += 1; if( message_version > 0 ) { - static const int * flags[] = { + static int * const flags[] = { &hf_jxta_message_flag_utf16be, &hf_jxta_message_flag_ucs32be, NULL @@ -1621,7 +1621,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p guint32 content_len; gchar *mediatype = NULL; tvbuff_t *element_content_tvb; - static const int * element_flags[] = { + static int * const element_flags[] = { &hf_jxta_element1_flag_hasType, &hf_jxta_element1_flag_hasEncoding, &hf_jxta_element1_flag_hasSignature, @@ -1879,7 +1879,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p guint64 content_len; const gchar *mediatype = NULL; tvbuff_t *element_content_tvb; - static const int * element_flags[] = { + static int * const element_flags[] = { &hf_jxta_element2_flag_64bitlens, &hf_jxta_element2_flag_nameLiteral, &hf_jxta_element2_flag_hasType, diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 8cb67fd5b2..26504976f2 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -3599,7 +3599,7 @@ dissect_krb5_decrypt_EncryptedChallenge(gboolean imp_tag _U_, tvbuff_t *tvb, int } #endif /* HAVE_KERBEROS */ -static const int *hf_krb_pa_supported_enctypes_fields[] = { +static int * const hf_krb_pa_supported_enctypes_fields[] = { &hf_krb_pa_supported_enctypes_des_cbc_crc, &hf_krb_pa_supported_enctypes_des_cbc_md5, &hf_krb_pa_supported_enctypes_rc4_hmac, @@ -3631,7 +3631,7 @@ dissect_kerberos_PA_SUPPORTED_ENCTYPES(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const int *hf_krb_ad_ap_options_fields[] = { +static int * const hf_krb_ad_ap_options_fields[] = { &hf_krb_ad_ap_options_cbt, NULL, }; @@ -4853,7 +4853,7 @@ dissect_kerberos_Authenticator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * TicketFlags_bits[] = { +static int * const TicketFlags_bits[] = { &hf_kerberos_TicketFlags_reserved, &hf_kerberos_TicketFlags_forwardable, &hf_kerberos_TicketFlags_forwarded, @@ -5340,7 +5340,7 @@ dissect_kerberos_SEQUENCE_OF_PA_DATA(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * KDCOptions_bits[] = { +static int * const KDCOptions_bits[] = { &hf_kerberos_KDCOptions_reserved, &hf_kerberos_KDCOptions_forwardable, &hf_kerberos_KDCOptions_forwarded, @@ -5606,7 +5606,7 @@ dissect_kerberos_TGS_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const int * APOptions_bits[] = { +static int * const APOptions_bits[] = { &hf_kerberos_APOptions_reserved, &hf_kerberos_APOptions_use_session_key, &hf_kerberos_APOptions_mutual_required, @@ -6710,7 +6710,7 @@ dissect_kerberos_PA_S4U_X509_USER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * PAC_OPTIONS_FLAGS_bits[] = { +static int * const PAC_OPTIONS_FLAGS_bits[] = { &hf_kerberos_PAC_OPTIONS_FLAGS_claims, &hf_kerberos_PAC_OPTIONS_FLAGS_branch_aware, &hf_kerberos_PAC_OPTIONS_FLAGS_forward_to_full_dc, @@ -7104,7 +7104,7 @@ dissect_kerberos_KrbFastReq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of return offset; } -static const int * FastOptions_bits[] = { +static int * const FastOptions_bits[] = { &hf_kerberos_FastOptions_reserved, &hf_kerberos_FastOptions_hide_client_names, &hf_kerberos_FastOptions_spare_bit2, diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index d9ec71128a..9f60be60a7 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -2667,7 +2667,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } -static const int * l2tp_control_fields[] = { +static int * const l2tp_control_fields[] = { &hf_l2tp_type, &hf_l2tp_length_bit, &hf_l2tp_seq_bit, @@ -3045,7 +3045,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data l2tp_tree = proto_item_add_subtree(l2tp_item, ett_l2tp); if (tree) { - static const int * control_fields[] = { + static int * const control_fields[] = { &hf_l2tp_type, &hf_l2tp_length_bit, &hf_l2tp_seq_bit, diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c index 76febafb98..c57a780e5b 100644 --- a/epan/dissectors/packet-lacp.c +++ b/epan/dissectors/packet-lacp.c @@ -162,7 +162,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_item *lacp_item, *tlv_type_item, *tlv_length_item; proto_item *ti; - static const int * actor_flags[] = { + static int * const actor_flags[] = { &hf_lacp_flags_a_activity, &hf_lacp_flags_a_timeout, &hf_lacp_flags_a_aggregation, @@ -173,7 +173,7 @@ dissect_lacp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ &hf_lacp_flags_a_expired, NULL }; - static const int * partner_flags[] = { + static int * const partner_flags[] = { &hf_lacp_flags_p_activity, &hf_lacp_flags_p_timeout, &hf_lacp_flags_p_aggregation, diff --git a/epan/dissectors/packet-lat.c b/epan/dissectors/packet-lat.c index 07238db273..e8f7643222 100644 --- a/epan/dissectors/packet-lat.c +++ b/epan/dissectors/packet-lat.c @@ -93,7 +93,7 @@ static int hf_lat_data_b_slot_control_flags_disable_output_flow_control = -1; static int hf_lat_data_b_slot_control_flags_break_detected = -1; static int hf_lat_data_b_slot_control_flags_set_port_char = -1; static int hf_lat_data_b_slot_control_flags_report_port_char = -1; -static const int *data_b_slot_control_flags_fields[] = { +static int * const data_b_slot_control_flags_fields[] = { &hf_lat_data_b_slot_control_flags_enable_input_flow_control, &hf_lat_data_b_slot_control_flags_disable_input_flow_control, &hf_lat_data_b_slot_control_flags_enable_output_flow_control, @@ -121,7 +121,7 @@ static const value_string data_b_slot_param_code_vals[] = { static int hf_lat_slot_data_remaining = -1; static int hf_lat_attention_slot_control_flags = -1; static int hf_lat_attention_slot_control_flags_abort = -1; -static const int *attention_slot_control_flags_fields[] = { +static int * const attention_slot_control_flags_fields[] = { &hf_lat_attention_slot_control_flags_abort, NULL }; @@ -163,7 +163,7 @@ static const value_string command_type_vals[] = { static int hf_lat_command_modifier = -1; static int hf_lat_command_modifier_send_status_periodically = -1; static int hf_lat_command_modifier_send_status_on_queue_depth_change = -1; -static const int *lat_command_modifier_fields[] = { +static int * const lat_command_modifier_fields[] = { &hf_lat_command_modifier_send_status_periodically, &hf_lat_command_modifier_send_status_on_queue_depth_change, NULL @@ -179,7 +179,7 @@ static int hf_lat_entry_length = -1; static int hf_lat_entry_status = -1; static int hf_lat_entry_status_rejected = -1; static int hf_lat_entry_status_additional_information = -1; -static const int *lat_entry_status_fields[] = { +static int * const lat_entry_status_fields[] = { &hf_lat_entry_status_rejected, &hf_lat_entry_status_additional_information, NULL @@ -234,7 +234,7 @@ static int hf_lat_dst_srvc_name = -1; static int hf_lat_response_status = -1; static int hf_lat_response_status_node_does_not_offer_requested_service = -1; -static const int *lat_response_status_fields[] = { +static int * const lat_response_status_fields[] = { &hf_lat_response_status_node_does_not_offer_requested_service, NULL }; @@ -242,7 +242,7 @@ static int hf_lat_src_node_status = -1; static int hf_lat_src_node_status_node_is_disabled = -1; static int hf_lat_src_node_status_start_message_can_be_sent = -1; static int hf_lat_src_node_status_command_message_can_be_sent = -1; -static const int *lat_src_node_status_fields[] = { +static int * const lat_src_node_status_fields[] = { &hf_lat_src_node_status_node_is_disabled, &hf_lat_src_node_status_start_message_can_be_sent, &hf_lat_src_node_status_command_message_can_be_sent, @@ -258,7 +258,7 @@ static int hf_lat_srvc_class = -1; static int hf_lat_srvc_status = -1; static int hf_lat_srvc_status_enabled = -1; static int hf_lat_srvc_status_supports_queueing = -1; -static const int *lat_srvc_status_fields[] = { +static int * const lat_srvc_status_fields[] = { &hf_lat_srvc_status_enabled, &hf_lat_srvc_status_supports_queueing, NULL diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 11e2d724f3..1361f6f1bc 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -6399,7 +6399,7 @@ static int dissect_nhdr_frag(tvbuff_t * tvb, int offset, packet_info * pinfo _U_ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_frag_flags_ignore, NULL @@ -6427,7 +6427,7 @@ static int dissect_nhdr_batch(tvbuff_t * tvb, int offset, packet_info * pinfo _U { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_batch_flags_ignore, &hf_lbmc_batch_flags_batch_start, @@ -6447,7 +6447,7 @@ static int dissect_nhdr_request(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_tcp_request_flags_ignore, NULL @@ -6471,7 +6471,7 @@ static int dissect_nhdr_topicname(tvbuff_t * tvb, int offset, packet_info * pinf proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_topicname_flags_ignore, NULL @@ -6651,7 +6651,7 @@ static int dissect_nhdr_umq_msgid(tvbuff_t * tvb, int offset, packet_info * pinf { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_msgid_flags_ignore, NULL @@ -6671,7 +6671,7 @@ static int dissect_nhdr_umq_sqd_rcv(tvbuff_t * tvb, int offset, packet_info * pi { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_sqd_rcv_flags_ignore, &hf_lbmc_umq_sqd_rcv_flags_r_flag, @@ -6712,7 +6712,7 @@ static int dissect_nhdr_umq_resub(tvbuff_t * tvb, int offset, packet_info * pinf { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_resub_flags_ignore, &hf_lbmc_umq_resub_flags_q_flag, @@ -6735,7 +6735,7 @@ static int dissect_nhdr_otid(tvbuff_t * tvb, int offset, packet_info * pinfo _U_ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_otid_flags_ignore, NULL @@ -6752,7 +6752,7 @@ static int dissect_nhdr_otid(tvbuff_t * tvb, int offset, packet_info * pinfo _U_ static void dissect_ctxinst(tvbuff_t * tvb, int offset, proto_tree * tree, lbmc_ctxinst_info_t * info) { - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ctxinst_flags_ignore, NULL @@ -6806,7 +6806,7 @@ static int dissect_nhdr_srcidx(tvbuff_t * tvb, int offset, packet_info * pinfo _ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_srcidx_flags_ignore, NULL @@ -6825,7 +6825,7 @@ static int dissect_nhdr_umq_ulb_msg(tvbuff_t * tvb, int offset, packet_info * pi { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_ulb_msg_flags_ignore, &hf_lbmc_umq_ulb_msg_flags_a_flag, @@ -6850,7 +6850,7 @@ static int dissect_nhdr_ssf_init(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ssf_init_flags_ignore, &hf_lbmc_ssf_init_flags_default_exclusions, @@ -6876,7 +6876,7 @@ static int dissect_nhdr_ssf_creq(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ssf_creq_flags_ignore, NULL @@ -6898,7 +6898,7 @@ static int dissect_nhdr_ume_preg(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_preg_flags_ignore, &hf_lbmc_ume_preg_flags_f_flag, @@ -6930,7 +6930,7 @@ static int dissect_nhdr_ume_preg_resp(tvbuff_t * tvb, int offset, packet_info * proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 code = 0; - static const int * codes[] = + static int * const codes[] = { &hf_lbmc_ume_preg_resp_code_ignore, &hf_lbmc_ume_preg_resp_code_o_flag, @@ -6940,7 +6940,7 @@ static int dissect_nhdr_ume_preg_resp(tvbuff_t * tvb, int offset, packet_info * &hf_lbmc_ume_preg_resp_code_d_flag, NULL }; - static const int * codes_e[] = + static int * const codes_e[] = { &hf_lbmc_ume_preg_resp_code_ignore, &hf_lbmc_ume_preg_resp_code_o_flag, @@ -6976,7 +6976,7 @@ static int dissect_nhdr_ume_ack(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_ack_flags_ignore, &hf_lbmc_ume_ack_flags_o_flag, @@ -7003,7 +7003,7 @@ static int dissect_nhdr_ume_rxreq(tvbuff_t * tvb, int offset, packet_info * pinf { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_rxreq_flags_ignore, &hf_lbmc_ume_rxreq_flags_tsni_req, @@ -7030,7 +7030,7 @@ static int dissect_nhdr_ume_keepalive(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_keepalive_flags_ignore, &hf_lbmc_ume_keepalive_flags_r_flag, @@ -7068,7 +7068,7 @@ static int dissect_nhdr_ume_ranged_ack(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_ranged_ack_flags_ignore, NULL @@ -7088,7 +7088,7 @@ static int dissect_nhdr_ume_ack_id(tvbuff_t * tvb, int offset, packet_info * pin { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_ack_id_flags_ignore, NULL @@ -7107,7 +7107,7 @@ static int dissect_nhdr_ume_capability(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_capability_flags_ignore, &hf_lbmc_ume_capability_flags_qc_flag, @@ -7127,7 +7127,7 @@ static int dissect_nhdr_ume_proxy_src(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_proxy_src_flags_ignore, &hf_lbmc_ume_proxy_src_flags_enable, @@ -7147,7 +7147,7 @@ static int dissect_nhdr_ume_store_group(tvbuff_t * tvb, int offset, packet_info { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_store_group_flags_ignore, NULL @@ -7168,7 +7168,7 @@ static int dissect_nhdr_ume_store(tvbuff_t * tvb, int offset, packet_info * pinf { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_store_flags_ignore, NULL @@ -7191,7 +7191,7 @@ static int dissect_nhdr_ume_lj_info(tvbuff_t * tvb, int offset, packet_info * pi { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_lj_info_flags_ignore, NULL @@ -7370,7 +7370,7 @@ static int dissect_nhdr_umq_reg(tvbuff_t * tvb, int offset, packet_info * pinfo, int len_dissected = 0; int len = 0; proto_item * reg_type_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_reg_flags_ignore, &hf_lbmc_umq_reg_flags_r_flag, @@ -7445,7 +7445,7 @@ static int dissect_nhdr_umq_reg_resp_ctx_ex(tvbuff_t * tvb, int offset, packet_i { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_reg_resp_reg_ctx_ex_flags_firstmsg, NULL @@ -7569,20 +7569,20 @@ static int dissect_nhdr_umq_reg_resp(tvbuff_t * tvb, int offset, packet_info * p guint8 hdrlen = 0; guint8 resp_type = 0; int len_dissected = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_reg_resp_flags_ignore, &hf_lbmc_umq_reg_resp_flags_r_flag, NULL }; - static const int * flags_err[] = + static int * const flags_err[] = { &hf_lbmc_umq_reg_resp_flags_ignore, &hf_lbmc_umq_reg_resp_flags_r_flag, &hf_lbmc_umq_reg_resp_flags_l_flag, NULL }; - static const int * flags_src[] = + static int * const flags_src[] = { &hf_lbmc_umq_reg_resp_flags_ignore, &hf_lbmc_umq_reg_resp_flags_r_flag, @@ -7731,7 +7731,7 @@ static int dissect_nhdr_umq_ack(tvbuff_t * tvb, int offset, packet_info * pinfo, guint8 idx; int len_dissected = 0; guint8 msg_count; - static const int * msgs[] = + static int * const msgs[] = { &hf_lbmc_umq_ack_msgs_ignore, &hf_lbmc_umq_ack_msgs_t_flag, @@ -7785,7 +7785,7 @@ static int dissect_nhdr_umq_rcr(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_rcr_flags_ignore, &hf_lbmc_umq_rcr_flags_r_flag, @@ -7873,7 +7873,7 @@ static int dissect_nhdr_umq_ka(tvbuff_t * tvb, int offset, packet_info * pinfo, int len_dissected = 0; int len; proto_item * ka_type_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_cntl_umq_ka_flags_ignore, &hf_lbmc_cntl_umq_ka_flags_r_flag, @@ -8046,7 +8046,7 @@ static int dissect_nhdr_umq_rxreq(tvbuff_t * tvb, int offset, packet_info * pinf guint8 hdrlen = 0; guint8 type; guint8 flags_val; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_rxreq_flags_ignore, &hf_lbmc_umq_rxreq_flags_r_flag, @@ -8129,7 +8129,7 @@ static int dissect_nhdr_umq_resub_req(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_resub_req_flags_ignore, NULL @@ -8153,7 +8153,7 @@ static int dissect_nhdr_umq_resub_resp(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_resub_resp_flags_ignore, NULL @@ -8177,7 +8177,7 @@ static int dissect_nhdr_topic_interest(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_topic_interest_flags_ignore, &hf_lbmc_topic_interest_flags_cancel, @@ -8198,7 +8198,7 @@ static int dissect_nhdr_pattern_interest(tvbuff_t * tvb, int offset, packet_info { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_pattern_interest_flags_ignore, &hf_lbmc_pattern_interest_flags_cancel, @@ -8221,7 +8221,7 @@ static int dissect_nhdr_advertisement(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_advertisement_flags_ignore, &hf_lbmc_advertisement_flags_eos, @@ -8230,7 +8230,7 @@ static int dissect_nhdr_advertisement(tvbuff_t * tvb, int offset, packet_info * &hf_lbmc_advertisement_flags_ctxinst, NULL }; - static const int * ad_flags[] = + static int * const ad_flags[] = { &hf_lbmc_advertisement_ad_flags_lj, &hf_lbmc_advertisement_ad_flags_ume, @@ -8263,7 +8263,7 @@ static int dissect_nhdr_storename(tvbuff_t * tvb, int offset, packet_info * pinf proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_storename_flags_ignore, NULL @@ -8297,7 +8297,7 @@ static int dissect_nhdr_umq_ulb_rcr(tvbuff_t * tvb, int offset, packet_info * pi { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_ulb_rcr_flags_ignore, &hf_lbmc_umq_ulb_rcr_flags_r_flag, @@ -8327,7 +8327,7 @@ static int dissect_nhdr_umq_lf(tvbuff_t * tvb, int offset, packet_info * pinfo _ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_lf_flags_ignore, NULL @@ -8350,7 +8350,7 @@ static int dissect_nhdr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo proto_tree * subtree = NULL; guint8 hdrlen = 0; guint16 flags_val = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ctxinfo_flags_ignore, &hf_lbmc_ctxinfo_flags_query, @@ -8400,7 +8400,7 @@ static int dissect_nhdr_ume_pser(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_pser_flags_ignore, &hf_lbmc_ume_pser_flags_source_ctxinst, @@ -8429,7 +8429,7 @@ static int dissect_nhdr_domain(tvbuff_t * tvb, int offset, packet_info * pinfo _ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_domain_flags_ignore, &hf_lbmc_domain_flags_active, @@ -8449,19 +8449,19 @@ static int dissect_nhdr_tnwg_capabilities(tvbuff_t * tvb, int offset, packet_inf { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_tnwg_capabilities_flags_ignore, &hf_lbmc_tnwg_capabilities_flags_version, NULL }; - static const int * cap1[] = + static int * const cap1[] = { &hf_lbmc_tnwg_capabilities_capabilities1_ume, &hf_lbmc_tnwg_capabilities_capabilities1_umq, NULL }; - static const int * cap3[] = + static int * const cap3[] = { &hf_lbmc_tnwg_capabilities_capabilities3_pcre, &hf_lbmc_tnwg_capabilities_capabilities3_regex, @@ -8484,7 +8484,7 @@ static int dissect_nhdr_patidx(tvbuff_t * tvb, int offset, packet_info * pinfo _ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_patidx_flags_ignore, NULL @@ -8503,7 +8503,7 @@ static int dissect_nhdr_ume_client_lifetime(tvbuff_t * tvb, int offset, packet_i { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_client_lifetime_flags_ignore, NULL @@ -8524,7 +8524,7 @@ static int dissect_nhdr_ume_sid(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_sid_flags_ignore, NULL @@ -8544,7 +8544,7 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_idx_cmd_flags_ignore, NULL @@ -8553,22 +8553,22 @@ static int dissect_nhdr_umq_idx_cmd(tvbuff_t * tvb, int offset, packet_info * pi proto_item * opt_subtree_item = NULL; proto_tree * opt_subtree = NULL; guint32 opt_flags = 0; - static const int * release_assign_flags[] = + static int * const release_assign_flags[] = { &hf_lbmc_umq_idx_cmd_release_assign_flags_numeric, NULL }; - static const int * ulb_release_assign_flags[] = + static int * const ulb_release_assign_flags[] = { &hf_lbmc_umq_idx_cmd_ulb_release_assign_flags_numeric, NULL }; - static const int * reserve_assign_flags[] = + static int * const reserve_assign_flags[] = { &hf_lbmc_umq_idx_cmd_reserve_assign_flags_numeric, NULL }; - static const int * ulb_reserve_assign_flags[] = + static int * const ulb_reserve_assign_flags[] = { &hf_lbmc_umq_idx_cmd_ulb_reserve_assign_flags_numeric, NULL @@ -8720,18 +8720,18 @@ static int dissect_nhdr_umq_idx_cmd_resp(tvbuff_t * tvb, int offset, packet_info proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_idx_cmd_resp_flags_ignore, &hf_lbmc_umq_idx_cmd_resp_flags_ulb, NULL }; - static const int * reserve_assign_flags[] = + static int * const reserve_assign_flags[] = { &hf_lbmc_umq_idx_cmd_resp_reserve_assign_flags_numeric, NULL }; - static const int * ulb_reserve_assign_flags[] = + static int * const ulb_reserve_assign_flags[] = { &hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags_numeric, NULL @@ -8876,7 +8876,7 @@ static int dissect_nhdr_odomain(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_odomain_flags_ignore, NULL @@ -8895,7 +8895,7 @@ static int dissect_nhdr_stream(tvbuff_t * tvb, int offset, packet_info * pinfo _ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_stream_flags_ignore, NULL @@ -8924,7 +8924,7 @@ static int dissect_nhdr_topic_md_interest(tvbuff_t * tvb, int offset, packet_inf proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_topic_md_interest_flags_ignore, &hf_lbmc_topic_md_interest_flags_cancel, @@ -8961,7 +8961,7 @@ static int dissect_nhdr_pattern_md_interest(tvbuff_t * tvb, int offset, packet_i proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_pattern_md_interest_flags_ignore, &hf_lbmc_pattern_md_interest_flags_cancel, @@ -8999,7 +8999,7 @@ static int dissect_nhdr_lji_req(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_lji_req_flags_ignore, &hf_lbmc_lji_req_flags_l_flag, @@ -9029,7 +9029,7 @@ static int dissect_nhdr_tnwg_ka(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_tnwg_ka_flags_ignore, &hf_lbmc_tnwg_ka_flags_q_flag, @@ -9058,7 +9058,7 @@ static int dissect_nhdr_ume_receiver_keepalive(tvbuff_t * tvb, int offset, packe { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_receiver_keepalive_flags_ignore, NULL @@ -9143,7 +9143,7 @@ static int dissect_nhdr_umq_cmd(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_cmd_flags_ignore, NULL @@ -9392,7 +9392,7 @@ static int dissect_nhdr_umq_cmd_resp(tvbuff_t * tvb, int offset, packet_info * p proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_cmd_resp_flags_ignore, NULL @@ -9464,7 +9464,7 @@ static int dissect_nhdr_sri_req(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_sri_req_flags_ignore, NULL @@ -9484,7 +9484,7 @@ static int dissect_nhdr_ume_store_domain(tvbuff_t * tvb, int offset, packet_info { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_store_domain_flags_ignore, NULL @@ -9503,7 +9503,7 @@ static int dissect_nhdr_sri(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_sri_flags_ignore, &hf_lbmc_sri_flags_acktosrc, @@ -9526,7 +9526,7 @@ static int dissect_nhdr_route_info(tvbuff_t * tvb, int offset, packet_info * pin { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_route_info_flags_ignore, NULL @@ -9553,7 +9553,7 @@ static int dissect_nhdr_route_info_neighbor(tvbuff_t * tvb, int offset, packet_i { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_route_info_neighbor_flags_ignore, NULL @@ -9575,7 +9575,7 @@ static int dissect_nhdr_gateway_name(tvbuff_t * tvb, int offset, packet_info * p proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_gateway_name_flags_ignore, NULL @@ -9610,7 +9610,7 @@ static int dissect_nhdr_auth_request(tvbuff_t * tvb, int offset, packet_info * p proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_auth_request_flags_ignore, NULL @@ -9644,7 +9644,7 @@ static int dissect_nhdr_auth_challenge(tvbuff_t * tvb, int offset, packet_info * proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_auth_challenge_flags_ignore, NULL @@ -9705,7 +9705,7 @@ static int dissect_nhdr_auth_challenge_rsp(tvbuff_t * tvb, int offset, packet_in proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_auth_challenge_rsp_flags_ignore, NULL @@ -9747,7 +9747,7 @@ static int dissect_nhdr_auth_result(tvbuff_t * tvb, int offset, packet_info * pi { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_auth_result_flags_ignore, NULL @@ -9802,7 +9802,7 @@ static int dissect_nhdr_hmac(tvbuff_t * tvb, int offset, packet_info * pinfo _U_ { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_hmac_flags_ignore, NULL @@ -9822,7 +9822,7 @@ static int dissect_nhdr_umq_sid(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_umq_sid_flags_ignore, NULL @@ -9842,7 +9842,7 @@ static int dissect_nhdr_destination(tvbuff_t * tvb, int offset, packet_info * pi { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_destination_flags_ignore, NULL @@ -9878,7 +9878,7 @@ static int dissect_nhdr_topic_idx(tvbuff_t * tvb, int offset, packet_info * pinf { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_topic_idx_flags_ignore, NULL @@ -9897,7 +9897,7 @@ static int dissect_nhdr_topic_source(tvbuff_t * tvb, int offset, packet_info * p { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_topic_source_flags_ignore, &hf_lbmc_topic_source_flags_eos, @@ -9917,12 +9917,12 @@ static int dissect_nhdr_topic_source_exfunc(tvbuff_t * tvb, int offset, packet_i { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_topic_source_exfunc_flags_ignore, NULL }; - static const int * functionality_flags[] = + static int * const functionality_flags[] = { &hf_lbmc_topic_source_exfunc_functionality_flags_lj, &hf_lbmc_topic_source_exfunc_functionality_flags_ume, @@ -9947,7 +9947,7 @@ static int dissect_nhdr_ume_store_ext(tvbuff_t * tvb, int offset, packet_info * { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_store_ext_flags_ignore, NULL @@ -9972,7 +9972,7 @@ static int dissect_nhdr_ume_psrc_election_token(tvbuff_t * tvb, int offset, pack { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_ume_psrc_election_token_flags_ignore, NULL @@ -9992,7 +9992,7 @@ static int dissect_nhdr_tcp_sid(tvbuff_t * tvb, int offset, packet_info * pinfo { proto_item * subtree_item = NULL; proto_tree * subtree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_tcp_sid_flags_ignore, NULL @@ -10054,7 +10054,7 @@ static int dissect_nhdr_extopt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_item * subtree_item = NULL; proto_tree * subtree = NULL; guint8 hdrlen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmc_extopt_flags_ignore, &hf_lbmc_extopt_flags_ignore_subtype, diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 2883fd8acc..ae13db17e9 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -3109,7 +3109,7 @@ static int dissect_lbmr_tnwg_ctxinst_opt(tvbuff_t * tvb, int offset, packet_info proto_tree * opt_tree = NULL; proto_item * opt_item = NULL; guint8 opt_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tnwg_opt_ctxinst_flags_ignore, NULL @@ -3130,7 +3130,7 @@ static int dissect_lbmr_tnwg_address_opt(tvbuff_t * tvb, int offset, packet_info proto_tree * opt_tree = NULL; proto_item * opt_item = NULL; guint8 opt_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tnwg_opt_address_flags_ignore, NULL @@ -3153,7 +3153,7 @@ static int dissect_lbmr_tnwg_domain_opt(tvbuff_t * tvb, int offset, packet_info proto_tree * opt_tree = NULL; proto_item * opt_item = NULL; guint8 opt_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tnwg_opt_domain_flags_ignore, NULL @@ -3174,7 +3174,7 @@ static int dissect_lbmr_tnwg_name_opt(tvbuff_t * tvb, int offset, packet_info * proto_tree * opt_tree = NULL; proto_item * opt_item = NULL; guint8 opt_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tnwg_opt_name_flags_ignore, NULL @@ -3197,7 +3197,7 @@ static int dissect_lbmr_tnwg_unknown_opt(tvbuff_t * tvb, int offset, packet_info proto_tree * opt_tree = NULL; proto_item * opt_item = NULL; guint8 opt_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tnwg_opt_flags_ignore, NULL @@ -3260,7 +3260,7 @@ static int dissect_lbmr_tnwg_interest_rec(tvbuff_t * tvb, int offset, packet_inf proto_item * rec_item = NULL; guint16 rec_len = 0; gint string_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tnwg_interest_rec_flags_pattern, &hf_lbmr_tnwg_interest_rec_flags_cancel, @@ -3322,7 +3322,7 @@ static int dissect_lbmr_tnwg_ctxinfo(tvbuff_t * tvb, int offset, packet_info * p { proto_tree * ctxinfo_tree = NULL; proto_item * ctxinfo_item = NULL; - static const int * flags1[] = + static int * const flags1[] = { &hf_lbmr_tnwg_ctxinfo_flags1_query, &hf_lbmr_tnwg_ctxinfo_flags1_tnwg_src, @@ -3425,7 +3425,7 @@ static int dissect_lbmr_tmr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, char * name = NULL; proto_item * ti = NULL; proto_tree * tinfo_tree = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_tmr_flags_response, &hf_lbmr_tmr_flags_wildcard_pcre, @@ -3589,7 +3589,7 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi proto_tree * otree = NULL; proto_item * optlen_item = NULL; proto_tree * optlen_tree = NULL; - static const int * opt_ume_flags[] = + static int * const opt_ume_flags[] = { &hf_lbmr_topt_ume_flags_ignore, &hf_lbmr_topt_ume_flags_latejoin, @@ -3598,28 +3598,28 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi &hf_lbmr_topt_ume_flags_acktosrc, NULL }; - static const int * opt_ume_store_flags[] = + static int * const opt_ume_store_flags[] = { &hf_lbmr_topt_ume_store_flags_ignore, NULL }; - static const int * opt_ume_store_group_flags[] = + static int * const opt_ume_store_group_flags[] = { &hf_lbmr_topt_ume_store_group_flags_ignore, NULL }; - static const int * opt_latejoin_flags[] = + static int * const opt_latejoin_flags[] = { &hf_lbmr_topt_latejoin_flags_ignore, &hf_lbmr_topt_latejoin_flags_acktosrc, NULL }; - static const int * opt_umq_rcridx_flags[] = + static int * const opt_umq_rcridx_flags[] = { &hf_lbmr_topt_umq_rcridx_flags_ignore, NULL }; - static const int * opt_umq_qinfo_flags[] = + static int * const opt_umq_qinfo_flags[] = { &hf_lbmr_topt_umq_qinfo_flags_ignore, &hf_lbmr_topt_umq_qinfo_flags_queue, @@ -3629,47 +3629,47 @@ static int dissect_lbmr_tir_options(tvbuff_t * tvb, int offset, packet_info * pi &hf_lbmr_topt_umq_qinfo_flags_participants_only, NULL }; - static const int * opt_cost_flags[] = + static int * const opt_cost_flags[] = { &hf_lbmr_topt_cost_flags_ignore, NULL }; - static const int * opt_otid_flags[] = + static int * const opt_otid_flags[] = { &hf_lbmr_topt_otid_flags_ignore, NULL }; - static const int * opt_ctxinst_flags[] = + static int * const opt_ctxinst_flags[] = { &hf_lbmr_topt_ctxinst_flags_ignore, NULL }; - static const int * opt_ctxinsts_flags[] = + static int * const opt_ctxinsts_flags[] = { &hf_lbmr_topt_ctxinsts_flags_ignore, NULL }; - static const int * opt_ulb_flags[] = + static int * const opt_ulb_flags[] = { &hf_lbmr_topt_ulb_flags_ignore, NULL }; - static const int * opt_ctxinstq_flags[] = + static int * const opt_ctxinstq_flags[] = { &hf_lbmr_topt_ctxinstq_flags_ignore, NULL }; - static const int * opt_domain_id_flags[] = + static int * const opt_domain_id_flags[] = { &hf_lbmr_topt_domain_id_flags_ignore, NULL }; - static const int * opt_exfunc_flags[] = + static int * const opt_exfunc_flags[] = { &hf_lbmr_topt_exfunc_flags_ignore, NULL }; - static const int * opt_exfunc_functionality_flags[] = + static int * const opt_exfunc_functionality_flags[] = { &hf_lbmr_topt_exfunc_functionality_flags_ulb, &hf_lbmr_topt_exfunc_functionality_flags_umq, @@ -4365,7 +4365,7 @@ static int dissect_lbmr_pser(tvbuff_t * tvb, int offset, packet_info * pinfo, pr int hdr_len = 0; int len = 0; int topic_len = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_pser_flags_option, NULL @@ -4453,13 +4453,13 @@ int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, prot guint16 idx; guint8 flags_val = 0; int len_dissected = 0; - static const int * flags[] = + static int * const flags[] = { &hf_qmgmt_flags_i_flag, &hf_qmgmt_flags_n_flag, NULL }; - static const int * il_flags[] = + static int * const il_flags[] = { &hf_qmgmt_flags_i_flag, &hf_qmgmt_flags_n_flag, @@ -4510,7 +4510,7 @@ int lbmr_dissect_umq_qmgmt(tvbuff_t * tvb, int offset, packet_info * pinfo, prot { proto_item * il_subtree_item = NULL; proto_tree * il_subtree = NULL; - static const int * il_inst_flags[] = + static int * const il_inst_flags[] = { &hf_qmgmt_il_inst_flags_m_flag, &hf_qmgmt_il_inst_flags_q_flag, @@ -4612,7 +4612,7 @@ static int dissect_lbmr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo { guint16 flags16 = 0; guint8 reclen = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_ctxinfo_flags_query, &hf_lbmr_ctxinfo_flags_ip, @@ -4644,7 +4644,7 @@ static int dissect_lbmr_ctxinfo(tvbuff_t * tvb, int offset, packet_info * pinfo /*----------------------------------------------------------------------------*/ static int dissect_lbmr_topic_res_request(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree) { - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_topic_res_request_flags_gw_remote_interest, &hf_lbmr_topic_res_request_flags_context_query, @@ -4786,7 +4786,7 @@ static int dissect_lbmr_rctxinfo_rec(tvbuff_t * tvb, int offset, packet_info * p proto_tree * subtree = NULL; proto_item * subtree_item = NULL; guint8 opt_type = 0; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_rctxinfo_rec_flags_query, NULL @@ -4889,7 +4889,7 @@ static int dissect_lbmr_opt_src_id(tvbuff_t * tvb, int offset, packet_info * pin { proto_tree * subtree = NULL; proto_item * subtree_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_opt_src_id_flags_ignore, NULL @@ -4908,7 +4908,7 @@ static int dissect_lbmr_opt_src_type(tvbuff_t * tvb, int offset, packet_info * p { proto_tree * subtree = NULL; proto_item * subtree_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_opt_src_type_flags_ignore, NULL @@ -4927,7 +4927,7 @@ static int dissect_lbmr_opt_version(tvbuff_t * tvb, int offset, packet_info * pi { proto_tree * subtree = NULL; proto_item * subtree_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_opt_version_flags_ignore, &hf_lbmr_opt_version_flags_ume, @@ -4948,7 +4948,7 @@ static int dissect_lbmr_opt_local_domain(tvbuff_t * tvb, int offset, packet_info { proto_tree * subtree = NULL; proto_item * subtree_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbmr_opt_local_domain_flags_ignore, NULL diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index b48bd25845..bafa35e1fa 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -991,7 +991,7 @@ static int dissect_lbtrm_sm(tvbuff_t * tvb, int offset, packet_info * pinfo, pro { proto_tree * sm_tree = NULL; proto_item * sm_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbtrm_sm_flags_fec_type_ucast_naks, NULL @@ -1024,7 +1024,7 @@ static int dissect_lbtrm_data(tvbuff_t * tvb, int offset, packet_info * pinfo, p { proto_tree * data_tree = NULL; proto_item * data_item = NULL; - static const int * flags[] = + static int * const flags[] = { &hf_lbtrm_data_flags_fec_type_ucast_naks, &hf_lbtrm_data_flags_fec_type_rx, diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index e688e0caf6..42b1b0c701 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1100,12 +1100,12 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, { proto_tree * lbtru_tree = NULL; proto_item * lbtru_item = NULL; - static const int * flags_data[] = + static int * const flags_data[] = { &hf_lbtru_hdr_flags_rx, NULL }; - static const int * flags_sm[] = + static int * const flags_sm[] = { &hf_lbtru_hdr_flags_syn, NULL @@ -1329,12 +1329,12 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, { proto_item * hdr_length_item; proto_tree * opt_tree = NULL; - static const int * sid_flags[] = + static int * const sid_flags[] = { &hf_lbtru_opt_sid_flags_ignore, NULL }; - static const int * cid_flags[] = + static int * const cid_flags[] = { &hf_lbtru_opt_cid_flags_ignore, NULL diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 2fbee1e576..1b59f77460 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -814,7 +814,7 @@ attribute_types_reset_cb(void) /* MS-ADTS specification, section 6.3.1.1, NETLOGON_NT_VERSION Options Bits */ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_mscldap_ntver_flags_v1, &hf_mscldap_ntver_flags_v5, &hf_mscldap_ntver_flags_v5ex, @@ -3432,7 +3432,7 @@ dissect_ldap_DirSyncFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, -1, &val); if (val >0) { - const int *flags[] = { + static int * const flags[] = { &hf_ldap_object_security_flag, &hf_ldap_ancestor_first_flag, &hf_ldap_public_data_only_flag, @@ -4283,7 +4283,7 @@ static const true_false_string tfs_ads_fnc = { }; static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_mscldap_netlogon_flags_fnc, &hf_mscldap_netlogon_flags_dnc, &hf_mscldap_netlogon_flags_dns, @@ -4593,7 +4593,7 @@ dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* static void ldap_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int * access_flags[] = { + static int * const access_flags[] = { &hf_ldap_AccessMask_ADS_CONTROL_ACCESS, &hf_ldap_AccessMask_ADS_LIST_OBJECT, &hf_ldap_AccessMask_ADS_DELETE_TREE, diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c index aa9278a1cf..507500e3a4 100644 --- a/epan/dissectors/packet-lg8979.c +++ b/epan/dissectors/packet-lg8979.c @@ -500,7 +500,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ /* This packet type is classified as a "Request" and is deemed in the direction of "master -> RTU" */ if (packet_type == LG8979_DIR_MASTER_TO_RTU) { - static const int * request_flags[] = { + static int * const request_flags[] = { &hf_lg8979_shr, &hf_lg8979_mfc, &hf_lg8979_ack, @@ -741,7 +741,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ /* This packet type is classified as a "Response" and is deemed in the direction of "RTU -> master" */ else if (packet_type == LG8979_DIR_RTU_TO_MASTER) { - static const int * response_flags[] = { + static int * const response_flags[] = { &hf_lg8979_shr, &hf_lg8979_con, &hf_lg8979_frz, diff --git a/epan/dissectors/packet-link16.c b/epan/dissectors/packet-link16.c index 838f4aa67a..3807073e7d 100644 --- a/epan/dissectors/packet-link16.c +++ b/epan/dissectors/packet-link16.c @@ -172,7 +172,7 @@ static gint hf_link16_contlabel = -1; static gint ett_link16 = -1; -static const int *link16_initial_word_fields[] = { +static int * const link16_initial_word_fields[] = { &hf_link16_wordformat, &hf_link16_label, &hf_link16_sublabel, @@ -180,18 +180,18 @@ static const int *link16_initial_word_fields[] = { NULL }; -static const int * link16_continuation_word_fields[] = { +static int * const link16_continuation_word_fields[] = { &hf_link16_wordformat, &hf_link16_contlabel, NULL }; -static const int * link16_extension_or_other_word_fields[] = { +static int * const link16_extension_or_other_word_fields[] = { &hf_link16_wordformat, NULL }; -static const int ** link16_fields[4] = { +static int * const *link16_fields[4] = { link16_initial_word_fields, link16_continuation_word_fields, link16_extension_or_other_word_fields, diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index bb3f3335a0..25663c7240 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -2945,7 +2945,7 @@ dissect_ieee_802_3_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } case 0x07: /* IEEE 802.3br Frame Preemption Protocol */ { - static const int * preemption_capabilities[] = { + static int * const preemption_capabilities[] = { &hf_ieee_802_3br_aec_support, &hf_ieee_802_3br_aec_enable, &hf_ieee_802_3br_aec_active, diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 63c2d72a40..64274d88d7 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -709,7 +709,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) val_to_str(message_type, message_type_vals, "Unknown (%u). ")); if (tree) { - static const int * header_flags[] = { + static int * const header_flags[] = { &hf_lmp_filter[LMPF_HDR_FLAGS_CC_DOWN], &hf_lmp_filter[LMPF_HDR_FLAGS_REBOOT], NULL @@ -1004,7 +1004,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: { float transmission_rate; - static const int * verify_flags[] = { + static int * const verify_flags[] = { &hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS], &hf_lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE], NULL @@ -1069,7 +1069,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case LMP_CLASS_TE_LINK: { - static const int * link_flags[] = { + static int * const link_flags[] = { &hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT], &hf_lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY], NULL @@ -1129,7 +1129,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case LMP_CLASS_DATA_LINK: { - static const int * link_flags[] = { + static int * const link_flags[] = { &hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT], &hf_lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED], NULL @@ -1354,7 +1354,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: { - static const int * error_flags[] = { + static int * const error_flags[] = { &hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK], &hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING], &hf_lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT], @@ -1374,7 +1374,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 2: { - static const int * error_flags[] = { + static int * const error_flags[] = { &hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS], &hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], &hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], @@ -1398,7 +1398,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 3: { - static const int * error_flags[] = { + static int * const error_flags[] = { &hf_lmp_filter[LMPF_VAL_ERROR_TRACE_UNSUPPORTED_TYPE], &hf_lmp_filter[LMPF_VAL_ERROR_TRACE_INVALID_MSG], &hf_lmp_filter[LMPF_VAL_ERROR_TRACE_UNKNOWN_CTYPE], @@ -1416,7 +1416,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 4: { - static const int * error_flags[] = { + static int * const error_flags[] = { &hf_lmp_filter[LMPF_VAL_ERROR_LAD_AREA_ID_MISMATCH], &hf_lmp_filter[LMPF_VAL_ERROR_LAD_TCP_ID_MISMATCH], &hf_lmp_filter[LMPF_VAL_ERROR_LAD_DA_DCN_MISMATCH], @@ -1521,7 +1521,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: { - static const int * sp_flags[] = { + static int * const sp_flags[] = { &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP], &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP], NULL @@ -1544,14 +1544,14 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 2: { - static const int * tp_flags[] = { + static int * const tp_flags[] = { &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD], &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD], &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD], NULL }; - static const int * cct_flags[] = { + static int * const cct_flags[] = { &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED], NULL }; @@ -1638,13 +1638,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 3: { - static const int * t_flags[] = { + static int * const t_flags[] = { &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH], &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH], NULL }; - static const int * tcm_flags[] = { + static int * const tcm_flags[] = { &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED], NULL }; @@ -1668,7 +1668,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 4: { - static const int * diversity_flags[] = { + static int * const diversity_flags[] = { &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE], &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK], &hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG], diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index c5778999de..a249170193 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -205,7 +205,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) lon_tree = proto_item_add_subtree(ti, ett_lon); { - static const gint *ppdu_fields[] = { + static int * const ppdu_fields[] = { &hf_lon_ppdu_prio, &hf_lon_ppdu_alt, &hf_lon_ppdu_deltabl, @@ -216,7 +216,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) offset++; } { - static const gint *npdu_fields[] = { + static int * const npdu_fields[] = { &hf_lon_npdu_version, &hf_lon_npdu_pdu_fmt, &hf_lon_npdu_addr_fmt, @@ -303,7 +303,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { case 0: /* TPDU */ { - static const gint *tpdu_fields[] = { + static int * const tpdu_fields[] = { &hf_lon_auth, &hf_lon_tpdu_tpdu_type, &hf_lon_trans_no, @@ -346,7 +346,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; case 1: /* SPDU */ { - static const gint *spdu_fields[] = { + static int * const spdu_fields[] = { &hf_lon_auth, &hf_lon_spdu_spdu_type, &hf_lon_trans_no, @@ -388,7 +388,7 @@ dissect_lon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) break; case 2: /* AuthPDU */ { - static const gint *authpdu_fields[] = { + static int * const authpdu_fields[] = { &hf_lon_authpdu_fmt, &hf_lon_authpdu_authpdu_type, &hf_lon_trans_no, @@ -430,7 +430,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, dest_type = tvb_get_guint8(tvb, offset); if ((dest_type&0x80) == 0x80) { /* Network variable */ - static const gint *nv_fields[] = { + static int * const nv_fields[] = { &hf_lon_nv_dir, &hf_lon_nv_selector, NULL @@ -439,7 +439,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, ett_nv, nv_fields, ENC_BIG_ENDIAN); offset += 2; } else if ((dest_type&0xc0) == 0) { /* Application */ - static const gint *app_fields[] = { + static int * const app_fields[] = { &hf_lon_app_code, NULL }; @@ -447,7 +447,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, ett_app, app_fields, ENC_BIG_ENDIAN); offset++; } else if ((dest_type&0xe0) == 0x60) { /* Network Management */ - static const gint *nm_fields[] = { + static int * const nm_fields[] = { &hf_lon_nm_code, NULL }; @@ -463,7 +463,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, } } else if ((dest_type&0xf0) == 0x50) { /* Network Diagnostic */ - static const gint *nd_fields[] = { + static int * const nd_fields[] = { &hf_lon_nd_code, NULL }; @@ -471,7 +471,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, ett_nd, nd_fields, ENC_BIG_ENDIAN); offset++; } else if ((dest_type&0xf0) == 0x40) { /* Foreign Frame */ - static const gint *ff_fields[] = { + static int * const ff_fields[] = { &hf_lon_ff_code, NULL }; diff --git a/epan/dissectors/packet-lorawan.c b/epan/dissectors/packet-lorawan.c index 7d3ca69587..af0c272362 100644 --- a/epan/dissectors/packet-lorawan.c +++ b/epan/dissectors/packet-lorawan.c @@ -489,13 +489,13 @@ dissect_lorawan_mac_commands(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint8 command; gint32 current_offset = 0; - static const int * link_adr_ans_flags[] = { + static int * const link_adr_ans_flags[] = { &hf_lorawan_mac_command_up_link_adr_ans_txpower_type, &hf_lorawan_mac_command_up_link_adr_ans_datarate_type, &hf_lorawan_mac_command_up_link_adr_ans_channel_mask_type, NULL }; - static const int * link_adr_req_channel_flags[] = { + static int * const link_adr_req_channel_flags[] = { &hf_lorawan_mac_command_down_link_adr_req_channel1_type, &hf_lorawan_mac_command_down_link_adr_req_channel2_type, &hf_lorawan_mac_command_down_link_adr_req_channel3_type, @@ -514,13 +514,13 @@ dissect_lorawan_mac_commands(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * &hf_lorawan_mac_command_down_link_adr_req_channel16_type, NULL }; - static const int * rx_setup_ans_flags[] = { + static int * const rx_setup_ans_flags[] = { &hf_lorawan_mac_command_up_rx_setup_ans_rx1droffset_type, &hf_lorawan_mac_command_up_rx_setup_ans_rx2datarate_type, &hf_lorawan_mac_command_up_rx_setup_ans_frequency_type, NULL }; - static const int * new_channel_ans_flags[] = { + static int * const new_channel_ans_flags[] = { &hf_lorawan_mac_command_up_new_channel_ans_datarate_type, &hf_lorawan_mac_command_up_new_channel_ans_frequency_type, NULL @@ -654,7 +654,7 @@ dissect_lorawan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *d gboolean uplink = TRUE; device_encryption_keys_t *encryption_keys = NULL; - static const int * flags[] = { + static int * const flags[] = { &hf_lorawan_frame_header_frame_control_adr_type, &hf_lorawan_frame_header_frame_control_adrackreq_type, &hf_lorawan_frame_header_frame_control_ack_type, diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c index e8c7d5670f..23a1dc4897 100644 --- a/epan/dissectors/packet-lpp.c +++ b/epan/dissectors/packet-lpp.c @@ -4210,7 +4210,7 @@ dissect_lpp_Acknowledgement(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * T_lpp_message_segmentation_req_r14_bits[] = { +static int * const T_lpp_message_segmentation_req_r14_bits[] = { &hf_lpp_T_lpp_message_segmentation_req_r14_serverToTarget, &hf_lpp_T_lpp_message_segmentation_req_r14_targetToServer, NULL @@ -4578,7 +4578,7 @@ dissect_lpp_SegmentationInfo_r14(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const int * T_lpp_message_segmentation_r14_bits[] = { +static int * const T_lpp_message_segmentation_r14_bits[] = { &hf_lpp_T_lpp_message_segmentation_r14_serverToTarget, &hf_lpp_T_lpp_message_segmentation_r14_targetToServer, NULL @@ -4661,7 +4661,7 @@ dissect_lpp_GNSS_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } -static const int * T_sbas_IDs_bits[] = { +static int * const T_sbas_IDs_bits[] = { &hf_lpp_T_sbas_IDs_waas, &hf_lpp_T_sbas_IDs_egnos, &hf_lpp_T_sbas_IDs_msas, @@ -4692,7 +4692,7 @@ dissect_lpp_SBAS_IDs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr } -static const int * T_posModes_bits[] = { +static int * const T_posModes_bits[] = { &hf_lpp_T_posModes_standalone, &hf_lpp_T_posModes_ue_based, &hf_lpp_T_posModes_ue_assisted, @@ -4770,7 +4770,7 @@ dissect_lpp_GNSS_SignalIDs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * T_accessTypes_bits[] = { +static int * const T_accessTypes_bits[] = { &hf_lpp_T_accessTypes_eutra, &hf_lpp_T_accessTypes_utra, &hf_lpp_T_accessTypes_gsm, @@ -4881,7 +4881,7 @@ dissect_lpp_GNSS_SupportList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * T_gnss_ids_bits[] = { +static int * const T_gnss_ids_bits[] = { &hf_lpp_T_gnss_ids_gps, &hf_lpp_T_gnss_ids_sbas, &hf_lpp_T_gnss_ids_qzss, @@ -4942,7 +4942,7 @@ dissect_lpp_GNSS_ReferenceLocationSupport(tvbuff_t *tvb _U_, int offset _U_, asn } -static const int * T_ionoModel_bits[] = { +static int * const T_ionoModel_bits[] = { &hf_lpp_T_ionoModel_klobuchar, &hf_lpp_T_ionoModel_neQuick, NULL @@ -5102,7 +5102,7 @@ dissect_lpp_GNSS_DifferentialCorrectionsSupport(tvbuff_t *tvb _U_, int offset _U } -static const int * T_clockModel_bits[] = { +static int * const T_clockModel_bits[] = { &hf_lpp_T_clockModel_model_1, &hf_lpp_T_clockModel_model_2, &hf_lpp_T_clockModel_model_3, @@ -5121,7 +5121,7 @@ dissect_lpp_T_clockModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const int * T_orbitModel_bits[] = { +static int * const T_orbitModel_bits[] = { &hf_lpp_T_orbitModel_model_1, &hf_lpp_T_orbitModel_model_2, &hf_lpp_T_orbitModel_model_3, @@ -5226,7 +5226,7 @@ dissect_lpp_GNSS_AcquisitionAssistanceSupport(tvbuff_t *tvb _U_, int offset _U_, } -static const int * T_almanacModel_bits[] = { +static int * const T_almanacModel_bits[] = { &hf_lpp_T_almanacModel_model_1, &hf_lpp_T_almanacModel_model_2, &hf_lpp_T_almanacModel_model_3, @@ -5260,7 +5260,7 @@ dissect_lpp_GNSS_AlmanacSupport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -static const int * T_utc_Model_bits[] = { +static int * const T_utc_Model_bits[] = { &hf_lpp_T_utc_Model_model_1, &hf_lpp_T_utc_Model_model_2, &hf_lpp_T_utc_Model_model_3, @@ -5664,7 +5664,7 @@ dissect_lpp_A_GNSS_ProvideCapabilities_eag_1(tvbuff_t *tvb _U_, int offset _U_, } -static const int * T_periodicAssistanceData_r15_bits[] = { +static int * const T_periodicAssistanceData_r15_bits[] = { &hf_lpp_T_periodicAssistanceData_r15_solicited, &hf_lpp_T_periodicAssistanceData_r15_unsolicited, NULL @@ -5711,7 +5711,7 @@ dissect_lpp_A_GNSS_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_c } -static const int * T_otdoa_Mode_bits[] = { +static int * const T_otdoa_Mode_bits[] = { &hf_lpp_T_otdoa_Mode_ue_assisted, &hf_lpp_T_otdoa_Mode_ue_assisted_NB_r14, &hf_lpp_T_otdoa_Mode_ue_assisted_NB_TDD_r15, @@ -6113,7 +6113,7 @@ dissect_lpp_OTDOA_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const int * T_ecid_MeasSupported_bits[] = { +static int * const T_ecid_MeasSupported_bits[] = { &hf_lpp_T_ecid_MeasSupported_rsrpSup, &hf_lpp_T_ecid_MeasSupported_rsrqSup, &hf_lpp_T_ecid_MeasSupported_ueRxTxSup, @@ -6235,7 +6235,7 @@ dissect_lpp_ECID_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * T_sensor_Modes_r13_bits[] = { +static int * const T_sensor_Modes_r13_bits[] = { &hf_lpp_T_sensor_Modes_r13_standalone, &hf_lpp_T_sensor_Modes_r13_ue_assisted, &hf_lpp_T_sensor_Modes_r13_ue_based, @@ -6383,7 +6383,7 @@ dissect_lpp_Sensor_ProvideCapabilities_r13(tvbuff_t *tvb _U_, int offset _U_, as } -static const int * T_tbs_Modes_r13_bits[] = { +static int * const T_tbs_Modes_r13_bits[] = { &hf_lpp_T_tbs_Modes_r13_standalone, &hf_lpp_T_tbs_Modes_r13_ue_assisted, &hf_lpp_T_tbs_Modes_r13_ue_based, @@ -6414,7 +6414,7 @@ dissect_lpp_MBS_AssistanceDataSupportList_r14(tvbuff_t *tvb _U_, int offset _U_, } -static const int * T_mbs_ConfigSupport_r14_bits[] = { +static int * const T_mbs_ConfigSupport_r14_bits[] = { &hf_lpp_T_mbs_ConfigSupport_r14_tb1, &hf_lpp_T_mbs_ConfigSupport_r14_tb2, &hf_lpp_T_mbs_ConfigSupport_r14_tb3, @@ -6477,7 +6477,7 @@ dissect_lpp_TBS_ProvideCapabilities_r13(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const int * T_wlan_Modes_r13_bits[] = { +static int * const T_wlan_Modes_r13_bits[] = { &hf_lpp_T_wlan_Modes_r13_standalone, &hf_lpp_T_wlan_Modes_r13_ue_assisted, &hf_lpp_T_wlan_Modes_r13_ue_based, @@ -6493,7 +6493,7 @@ dissect_lpp_T_wlan_Modes_r13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * T_wlan_MeasSupported_r13_bits[] = { +static int * const T_wlan_MeasSupported_r13_bits[] = { &hf_lpp_T_wlan_MeasSupported_r13_rssi_r13, &hf_lpp_T_wlan_MeasSupported_r13_rtt_r13, NULL @@ -6508,7 +6508,7 @@ dissect_lpp_T_wlan_MeasSupported_r13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * T_wlan_AP_AD_Supported_r14_bits[] = { +static int * const T_wlan_AP_AD_Supported_r14_bits[] = { &hf_lpp_T_wlan_AP_AD_Supported_r14_ap_identifier, &hf_lpp_T_wlan_AP_AD_Supported_r14_ap_location, NULL @@ -6569,7 +6569,7 @@ dissect_lpp_WLAN_ProvideCapabilities_r13(tvbuff_t *tvb _U_, int offset _U_, asn1 } -static const int * T_bt_Modes_r13_bits[] = { +static int * const T_bt_Modes_r13_bits[] = { &hf_lpp_T_bt_Modes_r13_standalone, &hf_lpp_T_bt_Modes_r13_ue_assisted, NULL @@ -6584,7 +6584,7 @@ dissect_lpp_T_bt_Modes_r13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * T_bt_MeasSupported_r13_bits[] = { +static int * const T_bt_MeasSupported_r13_bits[] = { &hf_lpp_T_bt_MeasSupported_r13_rssi_r13, NULL }; @@ -6875,7 +6875,7 @@ dissect_lpp_PeriodicSessionID_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * UpdateCapabilities_r15_bits[] = { +static int * const UpdateCapabilities_r15_bits[] = { &hf_lpp_UpdateCapabilities_r15_primaryCellID_r15, NULL }; @@ -8001,7 +8001,7 @@ dissect_lpp_INTEGER_0_503(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const int * T_adType_r14_bits[] = { +static int * const T_adType_r14_bits[] = { &hf_lpp_T_adType_r14_prs, &hf_lpp_T_adType_r14_nprs, NULL @@ -8096,7 +8096,7 @@ dissect_lpp_TBS_RequestAssistanceData_r14(tvbuff_t *tvb _U_, int offset _U_, asn } -static const int * T_requestedAD_r14_bits[] = { +static int * const T_requestedAD_r14_bits[] = { &hf_lpp_T_requestedAD_r14_ap_identifier, &hf_lpp_T_requestedAD_r14_ap_location, NULL @@ -15295,7 +15295,7 @@ dissect_lpp_OTDOA_RequestLocationInformation(tvbuff_t *tvb _U_, int offset _U_, } -static const int * T_requestedMeasurements_bits[] = { +static int * const T_requestedMeasurements_bits[] = { &hf_lpp_T_requestedMeasurements_rsrpReq, &hf_lpp_T_requestedMeasurements_rsrqReq, &hf_lpp_T_requestedMeasurements_ueRxTxReq, @@ -15369,7 +15369,7 @@ dissect_lpp_Sensor_RequestLocationInformation_r13(tvbuff_t *tvb _U_, int offset } -static const int * T_mbsRequestedMeasurements_r14_bits[] = { +static int * const T_mbsRequestedMeasurements_r14_bits[] = { &hf_lpp_T_mbsRequestedMeasurements_r14_rssi, NULL }; @@ -15412,7 +15412,7 @@ dissect_lpp_TBS_RequestLocationInformation_r13(tvbuff_t *tvb _U_, int offset _U_ } -static const int * T_requestedMeasurements_r13_bits[] = { +static int * const T_requestedMeasurements_r13_bits[] = { &hf_lpp_T_requestedMeasurements_r13_rssi, &hf_lpp_T_requestedMeasurements_r13_rtt, NULL @@ -15455,7 +15455,7 @@ dissect_lpp_WLAN_RequestLocationInformation_r13(tvbuff_t *tvb _U_, int offset _U } -static const int * T_requestedMeasurements_r13_01_bits[] = { +static int * const T_requestedMeasurements_r13_01_bits[] = { &hf_lpp_T_requestedMeasurements_r13_01_rssi, NULL }; @@ -16082,7 +16082,7 @@ dissect_lpp_CommonIEsProvideLocationInformation_eag_1(tvbuff_t *tvb _U_, int off } -static const int * LocationSource_r13_bits[] = { +static int * const LocationSource_r13_bits[] = { &hf_lpp_LocationSource_r13_a_gnss, &hf_lpp_LocationSource_r13_wlan, &hf_lpp_LocationSource_r13_bt, diff --git a/epan/dissectors/packet-lppe.c b/epan/dissectors/packet-lppe.c index 2757ac72a8..2fdf1a845a 100644 --- a/epan/dissectors/packet-lppe.c +++ b/epan/dissectors/packet-lppe.c @@ -2914,7 +2914,7 @@ dissect_lppe_OMA_LPPe_RequestCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn } -static const int * T_iP_Address_support_bits[] = { +static int * const T_iP_Address_support_bits[] = { &hf_lppe_T_iP_Address_support_iPv4, &hf_lppe_T_iP_Address_support_iPv6, &hf_lppe_T_iP_Address_support_nat, @@ -3082,7 +3082,7 @@ dissect_lppe_OMA_LPPe_RelativeLocationChange_Capabilities(tvbuff_t *tvb _U_, int } -static const int * OMA_LPPe_HighAccuracyFormatCapabilities_bits[] = { +static int * const OMA_LPPe_HighAccuracyFormatCapabilities_bits[] = { &hf_lppe_OMA_LPPe_HighAccuracyFormatCapabilities_hAposition, &hf_lppe_OMA_LPPe_HighAccuracyFormatCapabilities_hAvelocity, NULL @@ -3134,7 +3134,7 @@ dissect_lppe_OMA_LPPe_SegmentedAssistanceData_ProvideCapabs(tvbuff_t *tvb _U_, i } -static const int * T_relativeLocationReportingSupport_bits[] = { +static int * const T_relativeLocationReportingSupport_bits[] = { &hf_lppe_T_relativeLocationReportingSupport_geo, &hf_lppe_T_relativeLocationReportingSupport_civic, &hf_lppe_T_relativeLocationReportingSupport_otherProviders, @@ -3240,7 +3240,7 @@ dissect_lppe_OMA_LPPe_ScheduledLocation_Capabilities(tvbuff_t *tvb _U_, int offs } -static const int * OMA_LPPe_FixedAccessTypes_bits[] = { +static int * const OMA_LPPe_FixedAccessTypes_bits[] = { &hf_lppe_OMA_LPPe_FixedAccessTypes_cable, &hf_lppe_OMA_LPPe_FixedAccessTypes_dsl, &hf_lppe_OMA_LPPe_FixedAccessTypes_lan, @@ -3258,7 +3258,7 @@ dissect_lppe_OMA_LPPe_FixedAccessTypes(tvbuff_t *tvb _U_, int offset _U_, asn1_c } -static const int * OMA_LPPe_WirelessAccessTypes_bits[] = { +static int * const OMA_LPPe_WirelessAccessTypes_bits[] = { &hf_lppe_OMA_LPPe_WirelessAccessTypes_gsm, &hf_lppe_OMA_LPPe_WirelessAccessTypes_utra, &hf_lppe_OMA_LPPe_WirelessAccessTypes_lte, @@ -3333,7 +3333,7 @@ dissect_lppe_OMA_LPPe_CommonIEsProvideCapabilities(tvbuff_t *tvb _U_, int offset } -static const int * T_ionoModel_bits[] = { +static int * const T_ionoModel_bits[] = { &hf_lppe_T_ionoModel_localKlobuchar, &hf_lppe_T_ionoModel_ionoStormWarning, &hf_lppe_T_ionoModel_wideAreaIonoSurface, @@ -3363,7 +3363,7 @@ dissect_lppe_OMA_LPPe_AGNSS_IonosphericModelSupport(tvbuff_t *tvb _U_, int offse } -static const int * T_tropoModel_bits[] = { +static int * const T_tropoModel_bits[] = { &hf_lppe_T_tropoModel_localTroposphereDelay, &hf_lppe_T_tropoModel_surfaceParameters, NULL @@ -3586,7 +3586,7 @@ dissect_lppe_OMA_LPPe_AGNSS_AssistanceDataSupportList(tvbuff_t *tvb _U_, int off } -static const int * T_ionosphereMeasurementSupport_bits[] = { +static int * const T_ionosphereMeasurementSupport_bits[] = { &hf_lppe_T_ionosphereMeasurementSupport_tecPerSVsupport, &hf_lppe_T_ionosphereMeasurementSupport_zenithTecSupport, NULL @@ -3617,7 +3617,7 @@ dissect_lppe_OMA_LPPe_AGNSS_EnvironmentObservationSupportList(tvbuff_t *tvb _U_, } -static const int * T_modeSupport_bits[] = { +static int * const T_modeSupport_bits[] = { &hf_lppe_T_modeSupport_ueBased, &hf_lppe_T_modeSupport_ueAssisted, NULL @@ -3632,7 +3632,7 @@ dissect_lppe_T_modeSupport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * T_haGNSSantennaInformationSupport_bits[] = { +static int * const T_haGNSSantennaInformationSupport_bits[] = { &hf_lppe_T_haGNSSantennaInformationSupport_antennaDescriptionSupported, &hf_lppe_T_haGNSSantennaInformationSupport_antennaOrientationSupported, NULL @@ -3750,7 +3750,7 @@ dissect_lppe_OMA_LPPe_OTDOA_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _U } -static const int * T_eotdSupport_bits[] = { +static int * const T_eotdSupport_bits[] = { &hf_lppe_T_eotdSupport_ueBased, &hf_lppe_T_eotdSupport_ueAssisted, NULL @@ -3795,7 +3795,7 @@ dissect_lppe_OMA_LPPe_OTDOA_UTRA_ProvideCapabilities(tvbuff_t *tvb _U_, int offs } -static const int * T_ecid_lte_MeasSupported_bits[] = { +static int * const T_ecid_lte_MeasSupported_bits[] = { &hf_lppe_T_ecid_lte_MeasSupported_rsrp, &hf_lppe_T_ecid_lte_MeasSupported_rsrq, &hf_lppe_T_ecid_lte_MeasSupported_ueRxTx, @@ -3813,7 +3813,7 @@ dissect_lppe_T_ecid_lte_MeasSupported(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const int * T_ecid_lte_eNodeB_ADSupported_bits[] = { +static int * const T_ecid_lte_eNodeB_ADSupported_bits[] = { &hf_lppe_T_ecid_lte_eNodeB_ADSupported_bslist, &hf_lppe_T_ecid_lte_eNodeB_ADSupported_bslocation, &hf_lppe_T_ecid_lte_eNodeB_ADSupported_transmit_power, @@ -3835,7 +3835,7 @@ dissect_lppe_T_ecid_lte_eNodeB_ADSupported(tvbuff_t *tvb _U_, int offset _U_, as } -static const int * T_ecid_utra_HeNB_ADSupported_bits[] = { +static int * const T_ecid_utra_HeNB_ADSupported_bits[] = { &hf_lppe_T_ecid_utra_HeNB_ADSupported_bslist, &hf_lppe_T_ecid_utra_HeNB_ADSupported_bslocation, &hf_lppe_T_ecid_utra_HeNB_ADSupported_locationreliability, @@ -3872,7 +3872,7 @@ dissect_lppe_OMA_LPPe_ECID_LTE_ProvideCapabilities(tvbuff_t *tvb _U_, int offset } -static const int * T_ecid_gsm_MeasSupported_bits[] = { +static int * const T_ecid_gsm_MeasSupported_bits[] = { &hf_lppe_T_ecid_gsm_MeasSupported_rxLevel, &hf_lppe_T_ecid_gsm_MeasSupported_tA, &hf_lppe_T_ecid_gsm_MeasSupported_nMR_GERAN, @@ -3890,7 +3890,7 @@ dissect_lppe_T_ecid_gsm_MeasSupported(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const int * T_ecid_gsm_ADSupported_bits[] = { +static int * const T_ecid_gsm_ADSupported_bits[] = { &hf_lppe_T_ecid_gsm_ADSupported_bslist, &hf_lppe_T_ecid_gsm_ADSupported_bslocation, &hf_lppe_T_ecid_gsm_ADSupported_transmit_power, @@ -3926,7 +3926,7 @@ dissect_lppe_OMA_LPPe_ECID_GSM_ProvideCapabilities(tvbuff_t *tvb _U_, int offset } -static const int * T_ecid_utra_MeasSupported_bits[] = { +static int * const T_ecid_utra_MeasSupported_bits[] = { &hf_lppe_T_ecid_utra_MeasSupported_measuredResultsList, &hf_lppe_T_ecid_utra_MeasSupported_tdd_timingAdvance, &hf_lppe_T_ecid_utra_MeasSupported_mRL_utra_CarrierRSSI, @@ -3949,7 +3949,7 @@ dissect_lppe_T_ecid_utra_MeasSupported(tvbuff_t *tvb _U_, int offset _U_, asn1_c } -static const int * T_ecid_utra_nodeB_ADSupported_bits[] = { +static int * const T_ecid_utra_nodeB_ADSupported_bits[] = { &hf_lppe_T_ecid_utra_nodeB_ADSupported_bslist, &hf_lppe_T_ecid_utra_nodeB_ADSupported_bslocation, &hf_lppe_T_ecid_utra_nodeB_ADSupported_transmit_power, @@ -3970,7 +3970,7 @@ dissect_lppe_T_ecid_utra_nodeB_ADSupported(tvbuff_t *tvb _U_, int offset _U_, as } -static const int * T_ecid_utra_HNB_ADSupported_bits[] = { +static int * const T_ecid_utra_HNB_ADSupported_bits[] = { &hf_lppe_T_ecid_utra_HNB_ADSupported_bslist, &hf_lppe_T_ecid_utra_HNB_ADSupported_bslocation, &hf_lppe_T_ecid_utra_HNB_ADSupported_locationreliability, @@ -4006,7 +4006,7 @@ dissect_lppe_OMA_LPPe_ECID_UTRA_ProvideCapabilities(tvbuff_t *tvb _U_, int offse } -static const int * T_wlan_ecid_MeasSupported_bits[] = { +static int * const T_wlan_ecid_MeasSupported_bits[] = { &hf_lppe_T_wlan_ecid_MeasSupported_apSSID, &hf_lppe_T_wlan_ecid_MeasSupported_apSN, &hf_lppe_T_wlan_ecid_MeasSupported_apDevType, @@ -4035,7 +4035,7 @@ dissect_lppe_T_wlan_ecid_MeasSupported(tvbuff_t *tvb _U_, int offset _U_, asn1_c } -static const int * OMA_LPPe_WLAN_AP_Type_List_bits[] = { +static int * const OMA_LPPe_WLAN_AP_Type_List_bits[] = { &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11a, &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11b, &hf_lppe_OMA_LPPe_WLAN_AP_Type_List_ieee802_11g, @@ -4093,7 +4093,7 @@ dissect_lppe_OMA_LPPe_WLAN_AP_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1 } -static const int * T_wlan_ap_ADSupported_bits[] = { +static int * const T_wlan_ap_ADSupported_bits[] = { &hf_lppe_T_wlan_ap_ADSupported_aplist, &hf_lppe_T_wlan_ap_ADSupported_aplocation, &hf_lppe_T_wlan_ap_ADSupported_locationreliability, @@ -4113,7 +4113,7 @@ dissect_lppe_T_wlan_ap_ADSupported(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * T_additional_wlan_ecid_MeasSupported_bits[] = { +static int * const T_additional_wlan_ecid_MeasSupported_bits[] = { &hf_lppe_T_additional_wlan_ecid_MeasSupported_oc, &hf_lppe_T_additional_wlan_ecid_MeasSupported_ueMacAddr, NULL @@ -4146,7 +4146,7 @@ dissect_lppe_OMA_LPPe_WLAN_AP_ProvideCapabilities(tvbuff_t *tvb _U_, int offset } -static const int * T_ecid_wimax_MeasSupported_bits[] = { +static int * const T_ecid_wimax_MeasSupported_bits[] = { &hf_lppe_T_ecid_wimax_MeasSupported_rTD, &hf_lppe_T_ecid_wimax_MeasSupported_rTDstd, &hf_lppe_T_ecid_wimax_MeasSupported_nMR, @@ -4203,7 +4203,7 @@ dissect_lppe_OMA_LPPe_Sensor_ProvideCapabilities(tvbuff_t *tvb _U_, int offset _ } -static const int * T_srnMeasurements_bits[] = { +static int * const T_srnMeasurements_bits[] = { &hf_lppe_T_srnMeasurements_rssi, &hf_lppe_T_srnMeasurements_rtd, NULL @@ -4232,7 +4232,7 @@ dissect_lppe_OMA_LPPe_SRN_MeasurementMask(tvbuff_t *tvb _U_, int offset _U_, asn } -static const int * T_supportedAssistanceData_bits[] = { +static int * const T_supportedAssistanceData_bits[] = { &hf_lppe_T_supportedAssistanceData_srnGroup, &hf_lppe_T_supportedAssistanceData_antennaPattern, NULL @@ -4616,7 +4616,7 @@ dissect_lppe_OMA_LPPe_CommonIEsRequestAssistanceData(tvbuff_t *tvb _U_, int offs } -static const int * T_ionoreq_bits[] = { +static int * const T_ionoreq_bits[] = { &hf_lppe_T_ionoreq_klobucharModel, &hf_lppe_T_ionoreq_ionoStormWarning, NULL @@ -4743,7 +4743,7 @@ dissect_lppe_OMA_LPPe_AGNSS_IonosphericModelReq(tvbuff_t *tvb _U_, int offset _U } -static const int * T_troposphereModelReq_bits[] = { +static int * const T_troposphereModelReq_bits[] = { &hf_lppe_T_troposphereModelReq_delay, &hf_lppe_T_troposphereModelReq_surface, NULL @@ -5209,7 +5209,7 @@ dissect_lppe_T_lteCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_requestedCells_bits[] = { +static int * const T_requestedCells_bits[] = { &hf_lppe_T_requestedCells_eNBs, &hf_lppe_T_requestedCells_heNBs, NULL @@ -5239,7 +5239,7 @@ dissect_lppe_OMA_LPPe_OTDOA_RequestAssistanceData(tvbuff_t *tvb _U_, int offset } -static const int * T_eotdAssistanceReq_bits[] = { +static int * const T_eotdAssistanceReq_bits[] = { &hf_lppe_T_eotdAssistanceReq_ueAssisted, &hf_lppe_T_eotdAssistanceReq_ueBased, NULL @@ -5268,7 +5268,7 @@ dissect_lppe_OMA_LPPe_EOTD_RequestAssistanceData(tvbuff_t *tvb _U_, int offset _ } -static const int * T_otdoaUtraAssistanceReq_bits[] = { +static int * const T_otdoaUtraAssistanceReq_bits[] = { &hf_lppe_T_otdoaUtraAssistanceReq_ueAssisted, &hf_lppe_T_otdoaUtraAssistanceReq_ueBased, NULL @@ -5297,7 +5297,7 @@ dissect_lppe_OMA_LPPe_OTDOA_UTRA_RequestAssistanceData(tvbuff_t *tvb _U_, int of } -static const int * T_eNBrequestedAD_bits[] = { +static int * const T_eNBrequestedAD_bits[] = { &hf_lppe_T_eNBrequestedAD_bslist, &hf_lppe_T_eNBrequestedAD_bslocation, &hf_lppe_T_eNBrequestedAD_transmit_power, @@ -5319,7 +5319,7 @@ dissect_lppe_T_eNBrequestedAD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const int * T_heNBrequestedAD_bits[] = { +static int * const T_heNBrequestedAD_bits[] = { &hf_lppe_T_heNBrequestedAD_bslist, &hf_lppe_T_heNBrequestedAD_bslocation, &hf_lppe_T_heNBrequestedAD_locationreliability, @@ -5355,7 +5355,7 @@ dissect_lppe_OMA_LPPe_ECID_LTE_RequestAssistanceData(tvbuff_t *tvb _U_, int offs } -static const int * T_requestedAD_bits[] = { +static int * const T_requestedAD_bits[] = { &hf_lppe_T_requestedAD_bslist, &hf_lppe_T_requestedAD_bslocation, &hf_lppe_T_requestedAD_transmit_power, @@ -5390,7 +5390,7 @@ dissect_lppe_OMA_LPPe_ECID_GSM_RequestAssistanceData(tvbuff_t *tvb _U_, int offs } -static const int * T_nBrequestedAD_bits[] = { +static int * const T_nBrequestedAD_bits[] = { &hf_lppe_T_nBrequestedAD_bslist, &hf_lppe_T_nBrequestedAD_bslocation, &hf_lppe_T_nBrequestedAD_transmit_power, @@ -5411,7 +5411,7 @@ dissect_lppe_T_nBrequestedAD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * T_hNBrequestedAD_bits[] = { +static int * const T_hNBrequestedAD_bits[] = { &hf_lppe_T_hNBrequestedAD_bslist, &hf_lppe_T_hNBrequestedAD_bslocation, &hf_lppe_T_hNBrequestedAD_locationreliability, @@ -5446,7 +5446,7 @@ dissect_lppe_OMA_LPPe_ECID_UTRA_RequestAssistanceData(tvbuff_t *tvb _U_, int off } -static const int * T_requestedAD_01_bits[] = { +static int * const T_requestedAD_01_bits[] = { &hf_lppe_T_requestedAD_01_aplist, &hf_lppe_T_requestedAD_01_aplocation, &hf_lppe_T_requestedAD_01_locationreliability, @@ -12555,7 +12555,7 @@ dissect_lppe_OMA_LPPe_AGNSS_PositioningInstructions(tvbuff_t *tvb _U_, int offse } -static const int * T_ionosphereMeasurementsReq_bits[] = { +static int * const T_ionosphereMeasurementsReq_bits[] = { &hf_lppe_T_ionosphereMeasurementsReq_tecPerSV, &hf_lppe_T_ionosphereMeasurementsReq_zenithTEC, NULL @@ -12639,7 +12639,7 @@ dissect_lppe_OMA_LPPe_OTDOA_UTRA_RequestLocationInformation(tvbuff_t *tvb _U_, i } -static const int * T_requestedMeasurements_bits[] = { +static int * const T_requestedMeasurements_bits[] = { &hf_lppe_T_requestedMeasurements_rsrp, &hf_lppe_T_requestedMeasurements_rsrq, &hf_lppe_T_requestedMeasurements_ueRxTx, @@ -12671,7 +12671,7 @@ dissect_lppe_OMA_LPPe_ECID_LTE_RequestLocationInformation(tvbuff_t *tvb _U_, int } -static const int * T_requestedMeasurements_01_bits[] = { +static int * const T_requestedMeasurements_01_bits[] = { &hf_lppe_T_requestedMeasurements_01_rxLevel, &hf_lppe_T_requestedMeasurements_01_tA, &hf_lppe_T_requestedMeasurements_01_nMR_GERAN, @@ -12703,7 +12703,7 @@ dissect_lppe_OMA_LPPe_ECID_GSM_RequestLocationInformation(tvbuff_t *tvb _U_, int } -static const int * T_requestedMeasurements_02_bits[] = { +static int * const T_requestedMeasurements_02_bits[] = { &hf_lppe_T_requestedMeasurements_02_measuredResultsList, &hf_lppe_T_requestedMeasurements_02_tdd_timingAdvance, &hf_lppe_T_requestedMeasurements_02_mRL_utra_CarrierRSSI, @@ -12740,7 +12740,7 @@ dissect_lppe_OMA_LPPe_ECID_UTRA_RequestLocationInformation(tvbuff_t *tvb _U_, in } -static const int * T_requestedMeasurements_03_bits[] = { +static int * const T_requestedMeasurements_03_bits[] = { &hf_lppe_T_requestedMeasurements_03_apSSID, &hf_lppe_T_requestedMeasurements_03_apSN, &hf_lppe_T_requestedMeasurements_03_apDevType, @@ -12769,7 +12769,7 @@ dissect_lppe_T_requestedMeasurements_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const int * T_additionalRequestedMeasurements_bits[] = { +static int * const T_additionalRequestedMeasurements_bits[] = { &hf_lppe_T_additionalRequestedMeasurements_oc, &hf_lppe_T_additionalRequestedMeasurements_ueMacAddr, NULL @@ -12799,7 +12799,7 @@ dissect_lppe_OMA_LPPe_WLAN_AP_RequestLocationInformation(tvbuff_t *tvb _U_, int } -static const int * T_requestedMeasurements_04_bits[] = { +static int * const T_requestedMeasurements_04_bits[] = { &hf_lppe_T_requestedMeasurements_04_rTD, &hf_lppe_T_requestedMeasurements_04_rTDstd, &hf_lppe_T_requestedMeasurements_04_nMR, @@ -15190,7 +15190,7 @@ dissect_lppe_T_primaryMotionState(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * T_secondaryMotionState_bits[] = { +static int * const T_secondaryMotionState_bits[] = { &hf_lppe_T_secondaryMotionState_stationary, &hf_lppe_T_secondaryMotionState_pedestrian, &hf_lppe_T_secondaryMotionState_running, diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index ce05d9fed6..1c266ce41a 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -92242,7 +92242,7 @@ dissect_lte_rrc_T_measGapPatterns_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ct if (meas_gap_pattern_tvb) { - static const int *lte_rrc_meas_gap_pattern_flags[] = { + static int * const lte_rrc_meas_gap_pattern_flags[] = { &hf_lte_rrc_measGapPatterns_r15_bit1, &hf_lte_rrc_measGapPatterns_r15_bit2, &hf_lte_rrc_measGapPatterns_r15_bit3, diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c index c0def02708..0f6b785c3d 100644 --- a/epan/dissectors/packet-lustre.c +++ b/epan/dissectors/packet-lustre.c @@ -4349,7 +4349,7 @@ dissect_struct_llogd_body(tvbuff_t *tvb, int offset, proto_tree *parent_tree, gu proto_tree *tree; proto_item *item; int data_len; - static const int *flags[] = { + static int * const flags[] = { &hf_lustre_llog_hdr_flag_zap_when_empty, &hf_lustre_llog_hdr_flag_is_cat, &hf_lustre_llog_hdr_flag_is_plain, @@ -4429,7 +4429,7 @@ dissect_struct_llog_log_hdr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto proto_item *item; guint32 len, data_len, old_offset, i; - static const int *flags[] = { + static int * const flags[] = { &hf_lustre_llog_hdr_flag_zap_when_empty, &hf_lustre_llog_hdr_flag_is_cat, &hf_lustre_llog_hdr_flag_is_plain, @@ -4584,7 +4584,7 @@ dissect_struct_ldlm_intent(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto //proto_tree *tree; guint32 data_len; - static const int *flags[] = { + static int * const flags[] = { &hf_lustre_ldlm_intent_opc_open, &hf_lustre_ldlm_intent_opc_creat, &hf_lustre_ldlm_intent_opc_readdir, diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 5d95a86fbf..1f45ef1133 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -351,7 +351,7 @@ dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, tvbuff_t *next_client; guint8 dest_mac[6]; guint8 have_destmac=0; - static const int * flags[] = { + static int * const flags[] = { &hf_lwapp_flags_type, &hf_lwapp_flags_fragment, &hf_lwapp_flags_fragment_type, diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c index 116b1f4b09..fde3365ac4 100644 --- a/epan/dissectors/packet-mac-nr.c +++ b/epan/dissectors/packet-mac-nr.c @@ -1287,7 +1287,7 @@ static void dissect_rar(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset++; /* Break down the 27-bits of the grant field, according to 38.213, section 8.2 */ - static const int *rar_grant_fields[] = { + static int * const rar_grant_fields[] = { &hf_mac_nr_rar_grant_hopping, &hf_mac_nr_rar_grant_fra, &hf_mac_nr_rar_grant_tsa, @@ -1779,7 +1779,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree case MULTIPLE_ENTRY_PHR_1_LCID: case MULTIPLE_ENTRY_PHR_4_LCID: { - static const int * me_phr_byte1_flags[] = { + static int * const me_phr_byte1_flags[] = { &hf_mac_nr_control_me_phr_c7_flag, &hf_mac_nr_control_me_phr_c6_flag, &hf_mac_nr_control_me_phr_c5_flag, @@ -1790,7 +1790,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_me_phr_reserved, NULL }; - static const int * me_phr_byte2_flags[] = { + static int * const me_phr_byte2_flags[] = { &hf_mac_nr_control_me_phr_c15_flag, &hf_mac_nr_control_me_phr_c14_flag, &hf_mac_nr_control_me_phr_c13_flag, @@ -1801,7 +1801,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_me_phr_c8_flag, NULL }; - static const int * me_phr_byte3_flags[] = { + static int * const me_phr_byte3_flags[] = { &hf_mac_nr_control_me_phr_c23_flag, &hf_mac_nr_control_me_phr_c22_flag, &hf_mac_nr_control_me_phr_c21_flag, @@ -1812,7 +1812,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_me_phr_c16_flag, NULL }; - static const int * me_phr_byte4_flags[] = { + static int * const me_phr_byte4_flags[] = { &hf_mac_nr_control_me_phr_c31_flag, &hf_mac_nr_control_me_phr_c30_flag, &hf_mac_nr_control_me_phr_c29_flag, @@ -1837,7 +1837,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 3; } - static const int *ph_fields1[] = { + static int * const ph_fields1[] = { &hf_mac_nr_control_me_phr_ph_c1, &hf_mac_nr_control_me_phr_ph_c2, &hf_mac_nr_control_me_phr_ph_c3, @@ -1846,7 +1846,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_me_phr_ph_c6, &hf_mac_nr_control_me_phr_ph_c7, }; - static const int *ph_fields2_3_4[] = { + static int * const ph_fields2_3_4[] = { &hf_mac_nr_control_me_phr_ph_c8, &hf_mac_nr_control_me_phr_ph_c9, &hf_mac_nr_control_me_phr_ph_c10, @@ -1947,7 +1947,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree case SHORT_TRUNCATED_BSR_LCID: case SHORT_BSR_LCID: { - static const int *hf_mac_nr_control_bsr_short_bs_lcg[] = { + static int * const hf_mac_nr_control_bsr_short_bs_lcg[] = { &hf_mac_nr_control_bsr_short_bs_lcg0, &hf_mac_nr_control_bsr_short_bs_lcg1, &hf_mac_nr_control_bsr_short_bs_lcg2, @@ -1970,7 +1970,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case LONG_TRUNCATED_BSR_LCID: { - static const int * long_bsr_flags[] = { + static int * const long_bsr_flags[] = { &hf_mac_nr_control_bsr_long_lcg7, &hf_mac_nr_control_bsr_long_lcg6, &hf_mac_nr_control_bsr_long_lcg5, @@ -2002,7 +2002,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case LONG_BSR_LCID: { - static const int * long_bsr_flags[] = { + static int * const long_bsr_flags[] = { &hf_mac_nr_control_bsr_long_lcg7, &hf_mac_nr_control_bsr_long_lcg6, &hf_mac_nr_control_bsr_long_lcg5, @@ -2103,7 +2103,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case PUCCH_SPATIAL_REL_ACT_DEACT_LCID: { - static const int * pucch_spatial_rel_act_deact_flags[] = { + static int * const pucch_spatial_rel_act_deact_flags[] = { &hf_mac_nr_control_pucch_spatial_rel_act_deact_s8, &hf_mac_nr_control_pucch_spatial_rel_act_deact_s7, &hf_mac_nr_control_pucch_spatial_rel_act_deact_s6, @@ -2211,7 +2211,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case SP_CSI_REPORT_ON_PUCCH_ACT_DEACT_LCID: { - static const int * sp_csi_report_on_pucch_act_deact_flags[] = { + static int * const sp_csi_report_on_pucch_act_deact_flags[] = { &hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s7, &hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s6, &hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s5, @@ -2250,7 +2250,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree case TCI_STATES_ACT_DEACT_FOR_UE_SPEC_PDSCH_LCID: { guint32 start_offset = offset; - static const int * tci_states_act_deact_for_ue_spec_pdsc_flags[] = { + static int * const tci_states_act_deact_for_ue_spec_pdsc_flags[] = { &hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t7, &hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t6, &hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t5, @@ -2279,7 +2279,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree case APER_CSI_TRIGGER_STATE_SUBSELECT_LCID: { guint32 start_offset = offset; - static const int * aper_csi_trigger_state_subselect_flags[] = { + static int * const aper_csi_trigger_state_subselect_flags[] = { &hf_mac_nr_control_aper_csi_trigger_state_subselect_t7, &hf_mac_nr_control_aper_csi_trigger_state_subselect_t6, &hf_mac_nr_control_aper_csi_trigger_state_subselect_t5, @@ -2309,7 +2309,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree { gboolean ad; guint32 start_offset = offset; - static const int * sp_csi_rs_csi_im_res_set_act_deact_flags[] = { + static int * const sp_csi_rs_csi_im_res_set_act_deact_flags[] = { &hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved3, &hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_tci_state_id, NULL @@ -2345,7 +2345,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case DUPLICATION_ACTIVATION_DEACTIVATION_LCID: { - static const int * dupl_act_deact_flags[] = { + static int * const dupl_act_deact_flags[] = { &hf_mac_nr_control_dupl_act_deact_drb7, &hf_mac_nr_control_dupl_act_deact_drb6, &hf_mac_nr_control_dupl_act_deact_drb5, @@ -2364,7 +2364,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case SCELL_ACTIVATION_DEACTIVATION_4_LCID: { - static const int * scell_act_deact_1_flags[] = { + static int * const scell_act_deact_1_flags[] = { &hf_mac_nr_control_scell_act_deact_cell7, &hf_mac_nr_control_scell_act_deact_cell6, &hf_mac_nr_control_scell_act_deact_cell5, @@ -2375,7 +2375,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_scell_act_deact_reserved, NULL }; - static const int * scell_act_deact_2_flags[] = { + static int * const scell_act_deact_2_flags[] = { &hf_mac_nr_control_scell_act_deact_cell15, &hf_mac_nr_control_scell_act_deact_cell14, &hf_mac_nr_control_scell_act_deact_cell13, @@ -2386,7 +2386,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_scell_act_deact_cell8, NULL }; - static const int * scell_act_deact_3_flags[] = { + static int * const scell_act_deact_3_flags[] = { &hf_mac_nr_control_scell_act_deact_cell23, &hf_mac_nr_control_scell_act_deact_cell22, &hf_mac_nr_control_scell_act_deact_cell21, @@ -2397,7 +2397,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree &hf_mac_nr_control_scell_act_deact_cell16, NULL }; - static const int * scell_act_deact_4_flags[] = { + static int * const scell_act_deact_4_flags[] = { &hf_mac_nr_control_scell_act_deact_cell31, &hf_mac_nr_control_scell_act_deact_cell30, &hf_mac_nr_control_scell_act_deact_cell29, @@ -2423,7 +2423,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; case SCELL_ACTIVATION_DEACTIVATION_1_LCID: { - static const int * scell_act_deact_1_flags[] = { + static int * const scell_act_deact_1_flags[] = { &hf_mac_nr_control_scell_act_deact_cell7, &hf_mac_nr_control_scell_act_deact_cell6, &hf_mac_nr_control_scell_act_deact_cell5, diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index caf4b006b2..569ed95c76 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -64,7 +64,7 @@ static expert_field ei_macctrl_opcode = EI_INIT; static expert_field ei_macctrl_cbfc_enbv = EI_INIT; static expert_field ei_macctrl_dst_address = EI_INIT; -static const int *macctrl_cbfc_enbv_list[] = { +static int * const macctrl_cbfc_enbv_list[] = { &hf_macctrl_cbfc_enbv_c0, &hf_macctrl_cbfc_enbv_c1, &hf_macctrl_cbfc_enbv_c2, @@ -76,7 +76,7 @@ static const int *macctrl_cbfc_enbv_list[] = { NULL }; -static const int *macctrl_cbfc_pause_times_list[] = { +static int * const macctrl_cbfc_pause_times_list[] = { &hf_macctrl_cbfc_pause_time_c0, &hf_macctrl_cbfc_pause_time_c1, &hf_macctrl_cbfc_pause_time_c2, diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index 4fb7bfe65e..b186cd3939 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -99,7 +99,7 @@ static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } macsec_tree = proto_item_add_subtree(macsec_item, ett_macsec); - static const int * flags[] = { + static int * const flags[] = { &hf_macsec_TCI_V, &hf_macsec_TCI_ES, &hf_macsec_TCI_SC, diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 382f936b8f..26e57baa48 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -38,7 +38,7 @@ static int hf_mausb_flag_timestamp = -1; static int hf_mausb_flag_reserved = -1; -static const int *mausb_flag_fields[] = { +static int * const mausb_flag_fields[] = { &hf_mausb_flag_host, &hf_mausb_flag_retry, &hf_mausb_flag_timestamp, @@ -124,7 +124,7 @@ static int hf_mausb_tflag_eot = -1; static int hf_mausb_tflag_type = -1; static int hf_mausb_tflag_rsvd = -1; -static const int *mausb_tflag_fields[] = { +static int * const mausb_tflag_fields[] = { &hf_mausb_tflag_arq, &hf_mausb_tflag_neg, &hf_mausb_tflag_eot, @@ -139,7 +139,7 @@ static int hf_mausb_iflag_mtd = -1; static int hf_mausb_iflag_hdr_format = -1; static int hf_mausb_iflag_asap = -1; -static const int *mausb_iflag_fields[] = { +static int * const mausb_iflag_fields[] = { &hf_mausb_iflag_mtd, &hf_mausb_iflag_hdr_format, &hf_mausb_iflag_asap, diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index 2f2c0836b3..f2f15536bf 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -1399,13 +1399,13 @@ static const value_string mbim_device_caps_info_voice_class_vals[] = { { 0, NULL} }; -static const int *mbim_device_caps_info_sim_class_fields[] = { +static int * const mbim_device_caps_info_sim_class_fields[] = { &hf_mbim_device_caps_info_sim_class_logical, &hf_mbim_device_caps_info_sim_class_removable, NULL }; -static const int *mbim_data_class_fields[] = { +static int * const mbim_data_class_fields[] = { &hf_mbim_data_class_gprs, &hf_mbim_data_class_edge, &hf_mbim_data_class_umts, @@ -1425,7 +1425,7 @@ static const int *mbim_data_class_fields[] = { NULL }; -static const int *mbim_device_caps_info_sms_caps_fields[] = { +static int * const mbim_device_caps_info_sms_caps_fields[] = { &hf_mbim_device_caps_info_sms_caps_pdu_receive, &hf_mbim_device_caps_info_sms_caps_pdu_send, &hf_mbim_device_caps_info_sms_caps_text_receive, @@ -1433,7 +1433,7 @@ static const int *mbim_device_caps_info_sms_caps_fields[] = { NULL }; -static const int *mbim_device_caps_info_control_caps_fields[] = { +static int * const mbim_device_caps_info_control_caps_fields[] = { &hf_mbim_device_caps_info_control_caps_reg_manual, &hf_mbim_device_caps_info_control_caps_hw_radio_switch, &hf_mbim_device_caps_info_control_caps_cdma_mobile_ip, @@ -1515,7 +1515,7 @@ static const value_string mbim_pin_format_vals[] = { { 0, NULL} }; -static const int *mbim_provider_state_fields[] = { +static int * const mbim_provider_state_fields[] = { &hf_mbim_provider_state_home, &hf_mbim_provider_state_forbidden, &hf_mbim_provider_state_preferred, @@ -1584,7 +1584,7 @@ static const value_string mbim_register_mode_vals[] = { { 0, NULL} }; -static const int *mbim_registration_state_info_registration_flags_fields[] = { +static int * const mbim_registration_state_info_registration_flags_fields[] = { &hf_mbim_registration_state_info_registration_flags_manual_selection_not_available, &hf_mbim_registration_state_info_registration_flags_packet_service_auto_attach, NULL @@ -1700,7 +1700,7 @@ static const value_string mbim_context_type_vals[] = { { 0, NULL} }; -static const int *mbim_ip_configuration_info_ipv4_configuration_available_fields[] = { +static int * const mbim_ip_configuration_info_ipv4_configuration_available_fields[] = { &hf_mbim_ip_configuration_info_ipv4_configuration_available_address, &hf_mbim_ip_configuration_info_ipv4_configuration_available_gateway, &hf_mbim_ip_configuration_info_ipv4_configuration_available_dns, @@ -1708,7 +1708,7 @@ static const int *mbim_ip_configuration_info_ipv4_configuration_available_fields NULL }; -static const int *mbim_ip_configuration_info_ipv6_configuration_available_fields[] = { +static int * const mbim_ip_configuration_info_ipv6_configuration_available_fields[] = { &hf_mbim_ip_configuration_info_ipv6_configuration_available_address, &hf_mbim_ip_configuration_info_ipv6_configuration_available_gateway, &hf_mbim_ip_configuration_info_ipv6_configuration_available_dns, @@ -1716,7 +1716,7 @@ static const int *mbim_ip_configuration_info_ipv6_configuration_available_fields NULL }; -static const int *mbim_device_service_element_dss_payload_fields[] = { +static int * const mbim_device_service_element_dss_payload_fields[] = { &hf_mbim_device_service_element_dss_payload_host_device, &hf_mbim_device_service_element_dss_payload_device_host, NULL @@ -1804,7 +1804,7 @@ static const value_string mbim_sms_message_status_vals[] = { { 0, NULL} }; -static const int *mbim_sms_status_info_flags_fields[] = { +static int * const mbim_sms_status_info_flags_fields[] = { &hf_mbim_sms_status_info_flags_message_store_full, &hf_mbim_sms_status_info_flags_new_message, NULL @@ -1880,7 +1880,7 @@ static const value_string mbim_dss_link_state_vals[] = { { 0, NULL} }; -static const int *mbim_multicarrier_capabilities_fields[] = { +static int * const mbim_multicarrier_capabilities_fields[] = { &hf_mbim_multicarrier_capabilities_info_capabilities_static_scan, &hf_mbim_multicarrier_capabilities_info_capabilities_fw_requires_reboot, NULL @@ -2160,7 +2160,7 @@ static const value_string mbim_geoid_vals[] = { }; static value_string_ext mbim_geoid_vals_ext = VALUE_STRING_EXT_INIT(mbim_geoid_vals); -static const int *mbim_descriptor_network_capabilities_fields[] = { +static int * const mbim_descriptor_network_capabilities_fields[] = { &hf_mbim_descriptor_network_capabilities_max_datagram_size, &hf_mbim_descriptor_network_capabilities_ntb_input_size, NULL @@ -2341,7 +2341,7 @@ static const value_string mbim_ndp_ctrl_multiflow_status_vals[] = { { 0, NULL} }; -static const int *mbim_multiflow_caps_info_control_caps_fields[] = { +static int * const mbim_multiflow_caps_info_control_caps_fields[] = { &hf_mbim_multiflow_caps_info_control_caps_uplink, &hf_mbim_multiflow_caps_info_control_caps_downlink, NULL @@ -2393,7 +2393,7 @@ static const value_string mbim_ms_context_operations_vals[] = { { 0, NULL} }; -static const int *mbim_ms_network_blacklist_state_fields[] = { +static int * const mbim_ms_network_blacklist_state_fields[] = { &hf_mbim_ms_network_blacklist_state_sim_provider_actuated, &hf_mbim_ms_network_blacklist_state_network_provider_actuated, NULL diff --git a/epan/dissectors/packet-messageanalyzer.c b/epan/dissectors/packet-messageanalyzer.c index 066cd63393..f4637ab932 100644 --- a/epan/dissectors/packet-messageanalyzer.c +++ b/epan/dissectors/packet-messageanalyzer.c @@ -848,7 +848,7 @@ dissect_etw_ndis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint i, length; tvbuff_t *next_tvb; - static const int *keyword_fields[] = { + static int * const keyword_fields[] = { &hf_etw_ndis_keyword_ethernet8023, &hf_etw_ndis_keyword_reserved1, &hf_etw_ndis_keyword_wireless_wan, diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c index 307cdb5e20..c3882d98a8 100644 --- a/epan/dissectors/packet-metamako.c +++ b/epan/dissectors/packet-metamako.c @@ -48,7 +48,7 @@ static gint ett_metamako_timestamp = -1; static gint ett_metamako_extensions = -1; static gint ett_metamako_flags = -1; -static const int * flags[] = { +static int * const flags[] = { &hf_metamako_flags_orig_fcs_vld, &hf_metamako_flags_has_ext, &hf_metamako_reserved, diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index 4e538210d1..8326888588 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -452,7 +452,7 @@ static gint ett_link_desc_req = -1; static gint ett_dev_states_resp = -1; /*field definitions of evt, cmd, mob mgmt, ip cfg, iq type */ -static const int *event_fields[] = { +static int * const event_fields[] = { &hf_event_link_detect, &hf_event_link_up, &hf_event_link_dn, @@ -464,7 +464,7 @@ static const int *event_fields[] = { NULL }; -static const int *cmd_fields[] = { +static int * const cmd_fields[] = { &hf_cmd_event_subs, &hf_cmd_event_unsub, &hf_cmd_get_param, @@ -473,7 +473,7 @@ static const int *cmd_fields[] = { NULL }; -static const int *iq_type_fields[] = { +static int * const iq_type_fields[] = { &hf_iq_bin_data, &hf_iq_rdf_data, &hf_iq_rdf_sch_url, @@ -506,7 +506,7 @@ static const int *iq_type_fields[] = { NULL }; -static const int *mob_fields[] = { +static int * const mob_fields[] = { &hf_mob_mip4, &hf_mob_mip4_reg, &hf_mob_mip6, @@ -517,7 +517,7 @@ static const int *mob_fields[] = { NULL }; -static const int *cfg_fields[] = { +static int * const cfg_fields[] = { &hf_cfg_ip4_stat, &hf_cfg_dhcp4, &hf_cfg_mip_fa, @@ -529,26 +529,26 @@ static const int *cfg_fields[] = { }; /*field definitions for various bitmaps */ -static const int *trans_fields[] = { +static int * const trans_fields[] = { &hf_trans_udp, &hf_trans_tcp, NULL }; -static const int *dev_states_fields[] = { +static int * const dev_states_fields[] = { &hf_dev_states_req_dev_info, &hf_dev_states_req_batt_lvl, NULL }; -static const int *mihcap_fields[] = { +static int * const mihcap_fields[] = { &hf_mihcap_es, &hf_mihcap_cs, &hf_mihcap_is, NULL }; -static const int *net_caps_fields[] = { +static int * const net_caps_fields[] = { &hf_net_caps_sec, &hf_net_caps_qos0, &hf_net_caps_qos1, @@ -562,28 +562,28 @@ static const int *net_caps_fields[] = { NULL }; -static const int *ac_attr_fields[] = { +static int * const ac_attr_fields[] = { &hf_link_ac_attr_link_scan, &hf_link_ac_attr_link_res_retain, &hf_link_ac_attr_data_fwd_req, NULL }; -static const int *subtype_eth_fields[] = { +static int * const subtype_eth_fields[] = { &hf_link_subtype_eth_10m, &hf_link_subtype_eth_100m, &hf_link_subtype_eth_1000m, NULL }; -static const int *subtype_wireless_other_fields[] = { +static int * const subtype_wireless_other_fields[] = { &hf_link_subtype_wireless_other_dvb, &hf_link_subtype_wireless_other_tdmb, &hf_link_subtype_wireless_other_atsc, NULL }; -static const int *subtype_ieee80211_fields[] = { +static int * const subtype_ieee80211_fields[] = { &hf_link_subtype_ieee80211_24, &hf_link_subtype_ieee80211_5, &hf_link_subtype_ieee80211_49, @@ -592,7 +592,7 @@ static const int *subtype_ieee80211_fields[] = { NULL }; -static const int *subtype_umts_fields[] = { +static int * const subtype_umts_fields[] = { &hf_link_subtype_umts_99, &hf_link_subtype_umts_4, &hf_link_subtype_umts_5, @@ -602,7 +602,7 @@ static const int *subtype_umts_fields[] = { NULL }; -static const int *subtype_cdma2000_fields[] = { +static int * const subtype_cdma2000_fields[] = { &hf_link_subtype_cdma2000_0, &hf_link_subtype_cdma2000_a, &hf_link_subtype_cdma2000_b, @@ -610,7 +610,7 @@ static const int *subtype_cdma2000_fields[] = { NULL }; -static const int *subtype_ieee80216_fields[] = { +static int * const subtype_ieee80216_fields[] = { &hf_link_subtype_ieee80216_25, &hf_link_subtype_ieee80216_35, NULL diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 6ee8e0b8d5..37d23c4362 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -603,7 +603,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info case REV_SUPP_EXT: /* RFC 3543 */ { /* flags */ - static const int * flags[] = { + static int * const flags[] = { &hf_mip_rext_i, &hf_mip_rext_reserved, NULL @@ -630,7 +630,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info break; case UDP_TUN_REQ_EXT: /* RFC 3519 */ { - static const int * flags[] = { + static int * const flags[] = { &hf_mip_utrqext_f, &hf_mip_utrqext_r, &hf_mip_utrqext_reserved2, @@ -655,7 +655,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info break; case UDP_TUN_REP_EXT: /* RFC 3519 */ { - static const int * flags[] = { + static int * const flags[] = { &hf_mip_utrpext_f, &hf_mip_utrpext_reserved, NULL @@ -844,7 +844,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tvb_ip_to_str(tvb, 12)); if (tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_mip_s, &hf_mip_b, &hf_mip_d, @@ -966,7 +966,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tvb_ip_to_str(tvb, 12)); if (tree) { - static const int * mip_flags[] = { + static int * const mip_flags[] = { &hf_mip_rev_a, &hf_mip_rev_i, &hf_mip_rev_reserved2, @@ -1012,7 +1012,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tvb_ip_to_str(tvb, 4)); if (tree) { - static const int * mip_flags[] = { + static int * const mip_flags[] = { &hf_mip_ack_i, &hf_mip_ack_reserved2, NULL diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index d92d8626db..4e56d3fbf6 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1130,7 +1130,7 @@ dissect_mms_ObjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * Transitions_bits[] = { +static int * const Transitions_bits[] = { &hf_mms_Transitions_idle_to_disabled, &hf_mms_Transitions_active_to_disabled, &hf_mms_Transitions_disabled_to_idle, @@ -7058,7 +7058,7 @@ dissect_mms_Integer16(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ } -static const int * ParameterSupportOptions_bits[] = { +static int * const ParameterSupportOptions_bits[] = { &hf_mms_ParameterSupportOptions_str1, &hf_mms_ParameterSupportOptions_str2, &hf_mms_ParameterSupportOptions_vnam, @@ -7083,7 +7083,7 @@ dissect_mms_ParameterSupportOptions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * ServiceSupportOptions_bits[] = { +static int * const ServiceSupportOptions_bits[] = { &hf_mms_ServiceSupportOptions_status, &hf_mms_ServiceSupportOptions_getNameList, &hf_mms_ServiceSupportOptions_identify, diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index 18497b56c9..44cfde8973 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -830,7 +830,7 @@ dissect_op_msg_section(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tr static int dissect_mongo_op_msg(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree) { - static const int * mongo_msg_flags[] = { + static int * const mongo_msg_flags[] = { &hf_mongo_msg_flags_checksumpresent, &hf_mongo_msg_flags_moretocome, &hf_mongo_msg_flags_exhaustallowed, diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index ab6ecb707c..ad9de7cacf 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -383,7 +383,7 @@ static int dissect_mount_pathconf_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 pc_mask; - static const int * flags[] = { + static int * const flags[] = { &hf_mount_pathconf_error_all, &hf_mount_pathconf_error_link_max, &hf_mount_pathconf_error_max_canon, @@ -597,7 +597,7 @@ static const true_false_string tos_st_local = { static int dissect_mount_statvfs_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_mount_statvfs_flag_rdonly, &hf_mount_statvfs_flag_nosuid, &hf_mount_statvfs_flag_notrunc, diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index 073962923e..4251356963 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -916,28 +916,28 @@ static const value_string dsmcc_payload_name_vals[] = { }; /* U-N Session Message Flags */ -static const int *bf_message_id[] = { +static int * const bf_message_id[] = { &hf_dsmcc_un_sess_flag_message_discriminator, &hf_dsmcc_un_sess_flag_message_scenario, &hf_dsmcc_un_sess_flag_message_type, NULL }; -static const int *bf_transaction_id[] = { +static int * const bf_transaction_id[] = { &hf_dsmcc_un_sess_flag_transaction_id_originator, &hf_dsmcc_un_sess_flag_transaction_id_number, NULL }; -static const int *bf_rsrc_number[] = { +static int * const bf_rsrc_number[] = { &hf_dsmcc_un_sess_rsrc_flag_num_assignor, &hf_dsmcc_un_sess_rsrc_flag_num_value, NULL }; -static const int *bf_rsrc_association_tag[] = { +static int * const bf_rsrc_association_tag[] = { &hf_dsmcc_un_sess_rsrc_flag_association_tag_assignor, &hf_dsmcc_un_sess_rsrc_flag_association_tag_value, NULL }; -static const int *bf_rsrc_flags[] = { +static int * const bf_rsrc_flags[] = { &hf_dsmcc_un_sess_rsrc_flag_view, &hf_dsmcc_un_sess_rsrc_flag_attribute, &hf_dsmcc_un_sess_rsrc_flag_allocator, diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index 8bd1465bd5..eff259fea8 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -71,13 +71,13 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree *mpg_tree; unsigned int offset = 0; - static const int * mpg_fields1[] = { + static int * const mpg_fields1[] = { &hf_rtp_mpg_mbz, &hf_rtp_mpg_T, &hf_rtp_mpg_tr, NULL }; - static const int * mpg_fields2[] = { + static int * const mpg_fields2[] = { &hf_rtp_mpg_an, &hf_rtp_mpg_n, &hf_rtp_mpg_s, @@ -86,7 +86,7 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ &hf_rtp_mpg_p, NULL }; - static const int * mpg_fields3[] = { + static int * const mpg_fields3[] = { &hf_rtp_mpg_fbv, &hf_rtp_mpg_bfc, &hf_rtp_mpg_ffv, diff --git a/epan/dissectors/packet-mpls-mac.c b/epan/dissectors/packet-mpls-mac.c index e19336d3a1..13b14ea243 100644 --- a/epan/dissectors/packet-mpls-mac.c +++ b/epan/dissectors/packet-mpls-mac.c @@ -37,7 +37,7 @@ static int hf_mpls_mac_tlv_value = -1; static int hf_mpls_mac_tlv_sequence_number = -1; -static const int *mpls_mac_flags[] = { +static int * const mpls_mac_flags[] = { &hf_mpls_mac_flags_a, &hf_mpls_mac_flags_r, &hf_mpls_mac_flags_reserved, diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 5754a2de28..ef1a430add 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -104,7 +104,7 @@ static int hf_mq_tsh_tcf_first = -1; static int hf_mq_tsh_tcf_last = -1; static int hf_mq_tsh_tcf_reqacc = -1; static int hf_mq_tsh_tcf_dlq = -1; -static const int *pf_flds_tcf[] = +static int * const pf_flds_tcf[] = { &hf_mq_tsh_tcf_dlq , &hf_mq_tsh_tcf_reqacc , @@ -122,7 +122,7 @@ static int hf_mq_tsh_tcf2_HdrComp = -1; static int hf_mq_tsh_tcf2_MsgComp = -1; static int hf_mq_tsh_tcf2_CSH = -1; static int hf_mq_tsh_tcf2_CmitIntv = -1; -static const int *pf_flds_tcf2[] = +static int * const pf_flds_tcf2[] = { &hf_mq_tsh_tcf2_CmitIntv, &hf_mq_tsh_tcf2_CSH , @@ -194,7 +194,7 @@ static int hf_mq_id_icf1_RqstSecu = -1; static int hf_mq_id_icf1_mqreq = -1; static int hf_mq_id_icf1_svrsec = -1; static int hf_mq_id_icf1_runtime = -1; -static const int *pf_flds_icf1[] = +static int * const pf_flds_icf1[] = { &hf_mq_id_icf1_runtime , &hf_mq_id_icf1_svrsec , @@ -216,7 +216,7 @@ static int hf_mq_id_ief1_mxmsgsz = -1; static int hf_mq_id_ief1_mxmsgpb = -1; static int hf_mq_id_ief1_seqwrap = -1; static int hf_mq_id_ief1_hbint = -1; -static const int *pf_flds_ief1[] = +static int * const pf_flds_ief1[] = { &hf_mq_id_ief1_hbint , &hf_mq_id_ief1_seqwrap, @@ -238,7 +238,7 @@ static int hf_mq_id_icf2_XARunTApp = -1; static int hf_mq_id_icf2_SPIRqst = -1; static int hf_mq_id_icf2_DualUOW = -1; static int hf_mq_id_icf2_CanTrcRte = -1; -static const int *pf_flds_icf2[] = +static int * const pf_flds_icf2[] = { &hf_mq_id_icf2_CanTrcRte, &hf_mq_id_icf2_SPIRqst , @@ -255,7 +255,7 @@ static const int *pf_flds_icf2[] = static int hf_mq_id_ief2_HdrCmpLst = -1; static int hf_mq_id_ief2_MsgCmpLst = -1; static int hf_mq_id_ief2_SSLReset = -1; -static const int *pf_flds_ief2[] = +static int * const pf_flds_ief2[] = { &hf_mq_id_ief2_SSLReset , &hf_mq_id_ief2_MsgCmpLst, @@ -267,7 +267,7 @@ static const int *pf_flds_ief2[] = static int hf_mq_id_icf3_CanMsgPrp = -1; static int hf_mq_id_icf3_CanMulticast = -1; static int hf_mq_id_icf3_MPlxSyGet = -1; -static const int *pf_flds_icf3[] = +static int * const pf_flds_icf3[] = { &hf_mq_id_icf3_MPlxSyGet, &hf_mq_id_icf3_CanMulticast, @@ -281,7 +281,7 @@ static int hf_mq_id_ief3_CanMulticast = -1; static int hf_mq_id_ief3_PropIntSep = -1; static int hf_mq_id_ief3_MPlxSyGet = -1; static int hf_mq_id_ief3_ProtAlgorit = -1; -static const int *pf_flds_ief3[] = +static int * const pf_flds_ief3[] = { &hf_mq_id_ief3_ProtAlgorit, &hf_mq_id_ief3_MPlxSyGet, @@ -345,7 +345,7 @@ static int hf_mq_spi_spgo_size = -1; static int hf_mq_spi_opt_blank = -1; static int hf_mq_spi_opt_syncp = -1; static int hf_mq_spi_opt_deferred = -1; -static const int *pf_flds_spiopt[] = +static int * const pf_flds_spiopt[] = { &hf_mq_spi_opt_deferred, &hf_mq_spi_opt_syncp, @@ -361,7 +361,7 @@ static int hf_mq_close_options_DELETE_PURGE = -1; static int hf_mq_close_options_KEEP_SUB = -1; static int hf_mq_close_options_REMOVE_SUB = -1; static int hf_mq_close_options_QUIESCE = -1; -static const int *pf_flds_clsopt[] = +static int * const pf_flds_clsopt[] = { &hf_mq_close_options_QUIESCE , &hf_mq_close_options_REMOVE_SUB , @@ -395,7 +395,7 @@ static int hf_mq_open_options_NO_READ_AHEAD = -1; static int hf_mq_open_options_READ_AHEAD = -1; static int hf_mq_open_options_NO_MULTICAST = -1; static int hf_mq_open_options_BIND_ON_GROUP = -1; -static const int *pf_flds_opnopt[] = +static int * const pf_flds_opnopt[] = { &hf_mq_open_options_BIND_ON_GROUP , &hf_mq_open_options_NO_MULTICAST , @@ -562,7 +562,7 @@ static int hf_mq_gmo_options_SET_SIGNAL = -1; static int hf_mq_gmo_options_NO_SYNCPOINT = -1; static int hf_mq_gmo_options_SYNCPOINT = -1; static int hf_mq_gmo_options_WAIT = -1; -static const int *pf_flds_gmoopt[] = +static int * const pf_flds_gmoopt[] = { &hf_mq_gmo_options_PROPERTIES_COMPATIBILITY, &hf_mq_gmo_options_PROPERTIES_IN_HANDLE , @@ -601,7 +601,7 @@ static int hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER = -1; static int hf_mq_gmo_matchoptions_MATCH_GROUP_ID = -1; static int hf_mq_gmo_matchoptions_MATCH_CORREL_ID = -1; static int hf_mq_gmo_matchoptions_MATCH_MSG_ID = -1; -static const int *pf_flds_mtchopt[] = +static int * const pf_flds_mtchopt[] = { &hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN , &hf_mq_gmo_matchoptions_MATCH_OFFSET , @@ -626,7 +626,7 @@ static int hf_mq_lpoo_xtradata = -1; static int hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT = -1; static int hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT = -1; static int hf_mq_lpoo_lpiopts_SAVE_USER_CTXT = -1; -static const int *pf_flds_lpooopt[] = +static int * const pf_flds_lpooopt[] = { &hf_mq_lpoo_lpiopts_SAVE_USER_CTXT, &hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT, @@ -698,7 +698,7 @@ static int hf_mq_pmo_options_NEW_MSG_ID = -1; static int hf_mq_pmo_options_DEFAULT_CONTEXT = -1; static int hf_mq_pmo_options_NO_SYNCPOINT = -1; static int hf_mq_pmo_options_SYNCPOINT = -1; -static const int *pf_flds_pmoopt[] = +static int * const pf_flds_pmoopt[] = { &hf_mq_pmo_options_NOT_OWN_SUBS , &hf_mq_pmo_options_SUPPRESS_REPLYTO , @@ -733,7 +733,7 @@ static int hf_mq_xa_tmflags_success = -1; static int hf_mq_xa_tmflags_resume = -1; static int hf_mq_xa_tmflags_fail = -1; static int hf_mq_xa_tmflags_onephase = -1; -static const int *pf_flds_tmflags[] = +static int * const pf_flds_tmflags[] = { &hf_mq_xa_tmflags_onephase , &hf_mq_xa_tmflags_fail , @@ -770,7 +770,7 @@ static int hf_mq_msgreq_flags_selection = -1; static int hf_mq_msgreq_flags_F00000008 = -1; static int hf_mq_msgreq_flags_F00000004 = -1; static int hf_mq_msgreq_flags_F00000002 = -1; -static const int *pf_flds_msgreq_flags[] = +static int * const pf_flds_msgreq_flags[] = { &hf_mq_msgreq_flags_selection, &hf_mq_msgreq_flags_F00000008, @@ -810,7 +810,7 @@ static int hf_mq_head_flags = -1; static int hf_mq_head_struct = -1; static int hf_mq_dh_flags_newmsgid = -1; -static const int *pf_flds_dh_flags[] = +static int * const pf_flds_dh_flags[] = { &hf_mq_dh_flags_newmsgid, NULL @@ -824,7 +824,7 @@ static int hf_mq_iih_flags_passexpir = -1; static int hf_mq_iih_flags_replyfmtnone = -1; static int hf_mq_iih_flags_ignorepurg = -1; static int hf_mq_iih_flags_cmqrqstresp = -1; -static const int *pf_flds_iih_flags[] = +static int * const pf_flds_iih_flags[] = { &hf_mq_iih_flags_cmqrqstresp , &hf_mq_iih_flags_ignorepurg , @@ -871,7 +871,7 @@ static int hf_mq_tmc2_QMgrName = -1; static int hf_mq_cih_flags_synconret = -1; static int hf_mq_cih_flags_replywonulls = -1; static int hf_mq_cih_flags_passexpir = -1; -static const int *pf_flds_cih_flags[] = +static int * const pf_flds_cih_flags[] = { &hf_mq_cih_flags_synconret , &hf_mq_cih_flags_replywonulls, @@ -915,7 +915,7 @@ static int hf_mq_rfh_length = -1; static int hf_mq_rfh_string = -1; static int hf_mq_rmh_flags_last = -1; -static const int *pf_flds_rmh_flags[] = +static int * const pf_flds_rmh_flags[] = { &hf_mq_rmh_flags_last, NULL diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index d3df139362..0ec87ce3f5 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -758,7 +758,7 @@ static guint dissect_string(tvbuff_t *tvb, proto_tree *tree, guint offset, int h /* MQTT v5.0: Reason Codes */ static void dissect_mqtt_reason_code(proto_tree *mqtt_tree, tvbuff_t *tvb, guint offset, guint8 mqtt_msg_type) { - static const int *hf_rcode[] = { + static int * const hf_rcode[] = { NULL, /* RESERVED */ NULL, /* CONNECT */ &hf_mqtt_reason_code_connack, @@ -915,7 +915,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi mqtt_properties_t mqtt_will_properties = { 0 }; guint offset = 0; - static const int *publish_fields[] = { + static int * const publish_fields[] = { &hf_mqtt_msg_type, &hf_mqtt_dup_flag, &hf_mqtt_qos_level, @@ -923,7 +923,7 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi NULL }; - static const int *v31_pubrel_sub_unsub_fields[] = { + static int * const v31_pubrel_sub_unsub_fields[] = { &hf_mqtt_msg_type, &hf_mqtt_dup_flag, &hf_mqtt_qos_level, @@ -931,13 +931,13 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi NULL }; - static const int *other_fields[] = { + static int * const other_fields[] = { &hf_mqtt_msg_type, &hf_mqtt_reserved, NULL }; - static const int *connect_flags[] = { + static int * const connect_flags[] = { &hf_mqtt_conflag_user, &hf_mqtt_conflag_passwd, &hf_mqtt_conflag_will_retain, @@ -948,13 +948,13 @@ static int dissect_mqtt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi NULL }; - static const int *connack_flags[] = { + static int * const connack_flags[] = { &hf_mqtt_conackflag_reserved, &hf_mqtt_conackflag_sp, NULL }; - static const int *v50_subscription_flags[] = { + static int * const v50_subscription_flags[] = { &hf_mqtt_subscription_reserved, &hf_mqtt_subscription_retain, &hf_mqtt_subscription_rap, diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index 4e6e97c95f..7365c7319d 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -105,7 +105,7 @@ static int hf_mmrp_vector_header = -1; static int hf_mmrp_leave_all_event = -1; static int hf_mmrp_number_of_values = -1; static gint ett_vector_header = -1; -static const int *vector_header_fields[] = { +static int * const vector_header_fields[] = { &hf_mmrp_leave_all_event, &hf_mmrp_number_of_values, NULL diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 63f69fd96c..21b5a127f8 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -217,7 +217,7 @@ static int hf_msrp_vector_header = -1; static int hf_msrp_leave_all_event = -1; static int hf_msrp_number_of_values = -1; static gint ett_vector_header = -1; -static const int *vector_header_fields[] = { +static int * const vector_header_fields[] = { &hf_msrp_leave_all_event, &hf_msrp_number_of_values, NULL @@ -234,7 +234,7 @@ static int hf_msrp_priority = -1; static int hf_msrp_rank = -1; static int hf_msrp_reserved = -1; static gint ett_priority_and_rank = -1; -static const int *priority_and_rank_fields[] = { +static int * const priority_and_rank_fields[] = { &hf_msrp_priority, &hf_msrp_rank, &hf_msrp_reserved, diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c index 975a027509..4367dae8fb 100644 --- a/epan/dissectors/packet-mrp-mvrp.c +++ b/epan/dissectors/packet-mrp-mvrp.c @@ -102,7 +102,7 @@ static int hf_mvrp_vector_header = -1; static int hf_mvrp_leave_all_event = -1; static int hf_mvrp_number_of_values = -1; static gint ett_vector_header = -1; -static const int *vector_header_fields[] = { +static int * const vector_header_fields[] = { &hf_mvrp_leave_all_event, &hf_mvrp_number_of_values, NULL diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c index a4ecc544fd..e5ad5104ef 100644 --- a/epan/dissectors/packet-mswsp.c +++ b/epan/dissectors/packet-mswsp.c @@ -4868,7 +4868,7 @@ int parse_CCategorizationSpec(tvbuff_t *tvb, packet_info *pinfo, int offset, pro return offset; } -static const int *mswsp_bool_options[] = { +static int * const mswsp_bool_options[] = { &hf_mswsp_bool_options_cursor, &hf_mswsp_bool_options_async, &hf_mswsp_bool_options_firstrows, diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index f7000d7b80..bf1fa720bc 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -802,7 +802,7 @@ static const mysql_exec_dissector_t mysql_exec_dissectors[] = { { 0x00, 0, NULL }, }; -static const int *mysql_rfsh_flags[] = { +static int * const mysql_rfsh_flags[] = { &hf_mysql_rfsh_grants, &hf_mysql_rfsh_log, &hf_mysql_rfsh_tables, @@ -814,7 +814,7 @@ static const int *mysql_rfsh_flags[] = { NULL }; -static const int *mysql_stat_flags[] = { +static int * const mysql_stat_flags[] = { &hf_mysql_stat_it, &hf_mysql_stat_ac, &hf_mysql_stat_mu, @@ -833,7 +833,7 @@ static const int *mysql_stat_flags[] = { NULL }; -static const int *mysql_caps_flags[] = { +static int * const mysql_caps_flags[] = { &hf_mysql_cap_long_password, &hf_mysql_cap_found_rows, &hf_mysql_cap_long_flag, @@ -853,7 +853,7 @@ static const int *mysql_caps_flags[] = { NULL }; -static const int * mysql_extcaps_flags[] = { +static int * const mysql_extcaps_flags[] = { &hf_mysql_cap_multi_statements, &hf_mysql_cap_multi_results, &hf_mysql_cap_ps_multi_results, @@ -867,7 +867,7 @@ static const int * mysql_extcaps_flags[] = { NULL }; -static const int * mysql_fld_flags[] = { +static int * const mysql_fld_flags[] = { &hf_mysql_fld_not_null, &hf_mysql_fld_primary_key, &hf_mysql_fld_unique_key, diff --git a/epan/dissectors/packet-nano.c b/epan/dissectors/packet-nano.c index c7fe7e545f..60cf43a1a9 100644 --- a/epan/dissectors/packet-nano.c +++ b/epan/dissectors/packet-nano.c @@ -355,7 +355,7 @@ static int dissect_nano_header(tvbuff_t *tvb, proto_tree *nano_tree, int offset, { proto_tree *header_tree; char *nano_magic_number; - static const int *nano_extensions[] = { + static int * const nano_extensions[] = { &hf_nano_extensions_block_type, NULL }; diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index eb32003312..10751fab9e 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -555,7 +555,7 @@ de_nas_5gs_mm_5gmm_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, { guint32 curr_offset; - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -714,13 +714,13 @@ de_nas_5gs_mm_5gs_mobile_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, tvbuff_t * new_tvb; const char *digit_str, *route_id_str; - static const int * flags_odd_even_tid[] = { + static int * const flags_odd_even_tid[] = { &hf_nas_5gs_mm_odd_even, &hf_nas_5gs_mm_type_id, NULL }; - static const int * flags_supi_fmt_tid[] = { + static int * const flags_supi_fmt_tid[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_mm_supi_fmt, &hf_nas_5gs_spare_b3, @@ -876,7 +876,7 @@ de_nas_5gs_mm_5gs_nw_feat_sup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf { guint32 curr_offset = offset; - static const int * flags_oct3[] = { + static int * const flags_oct3[] = { &hf_nas_5gs_nw_feat_sup_mpsi_b7, &hf_nas_5gs_nw_feat_sup_ims_iwk_n26_b6, &hf_nas_5gs_nw_feat_sup_ims_emf_b5b4, @@ -886,7 +886,7 @@ de_nas_5gs_mm_5gs_nw_feat_sup(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf NULL }; - static const int * flags_oct4[] = { + static int * const flags_oct4[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -933,7 +933,7 @@ de_nas_5gs_mm_5gs_reg_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U gchar *add_string _U_, int string_len _U_) { - static const int* flags[] = { + static int* const flags[] = { &hf_nas_5gs_mm_reg_res_nssaa_perf, &hf_nas_5gs_mm_reg_res_sms_allowed, &hf_nas_5gs_mm_reg_res_res, @@ -964,7 +964,7 @@ static true_false_string nas_5gs_for_tfs = { "No follow-on request pending" }; -static const int * nas_5gs_registration_type_flags[] = { +static int * const nas_5gs_registration_type_flags[] = { &hf_nas_5gs_mm_for, &hf_nas_5gs_mm_5gs_reg_type, NULL @@ -1044,7 +1044,7 @@ de_nas_5gs_mm_5gs_ta_id_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo proto_tree *sub_tree; proto_item *item; - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_mm_tal_t_li, &hf_nas_5gs_mm_tal_num_e, NULL @@ -1136,7 +1136,7 @@ de_nas_5gs_mm_update_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_mm_ng_ran_rcu, @@ -1165,7 +1165,7 @@ de_nas_5gs_mm_abba(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, /* * 9.11.3.11 Access type */ -static const int* nas_5gs_mm_access_type_flags[] = { +static int* const nas_5gs_mm_access_type_flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_mm_acc_type, @@ -1192,7 +1192,7 @@ de_nas_5gs_mm_add_5g_sec_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_mm_rinmr, @@ -1221,7 +1221,7 @@ de_nas_5gs_mm_allow_pdu_ses_sts(tvbuff_t *tvb, proto_tree *tree, packet_info *pi { int curr_offset; - static const int * psi_0_7_flags[] = { + static int * const psi_0_7_flags[] = { &hf_nas_5gs_allow_pdu_ses_sts_psi_7_b7, &hf_nas_5gs_allow_pdu_ses_sts_psi_6_b6, &hf_nas_5gs_allow_pdu_ses_sts_psi_5_b5, @@ -1233,7 +1233,7 @@ de_nas_5gs_mm_allow_pdu_ses_sts(tvbuff_t *tvb, proto_tree *tree, packet_info *pi NULL }; - static const int * psi_8_15_flags[] = { + static int * const psi_8_15_flags[] = { &hf_nas_5gs_allow_pdu_ses_sts_psi_15_b7, &hf_nas_5gs_allow_pdu_ses_sts_psi_14_b6, &hf_nas_5gs_allow_pdu_ses_sts_psi_13_b5, @@ -1285,7 +1285,7 @@ de_nas_5gs_mm_conf_upd_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_mm_conf_upd_ind_red_b1, @@ -1470,7 +1470,7 @@ de_nas_5gs_mm_mico_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_spare_b1, @@ -1496,7 +1496,7 @@ de_nas_5gs_mm_nas_key_set_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_mm_tsc, &hf_nas_5gs_mm_nas_key_set_id, NULL @@ -1514,7 +1514,7 @@ de_nas_5gs_mm_nas_key_set_id_h1(tvbuff_t* tvb, proto_tree* tree, packet_info* pi guint32 offset, guint len _U_, gchar* add_string _U_, int string_len _U_) { - static const int* flags[] = { + static int* const flags[] = { &hf_nas_5gs_mm_tsc_h1, &hf_nas_5gs_mm_nas_key_set_id_h1, NULL @@ -1577,7 +1577,7 @@ de_nas_5gs_mm_nas_sec_algo(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_mm_nas_sec_algo_enc, &hf_nas_5gs_mm_nas_sec_algo_ip, NULL @@ -1609,7 +1609,7 @@ de_nas_5gs_mm_nw_slicing_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_mm_dcni, @@ -1669,7 +1669,7 @@ de_nas_5gs_mm_nssai_inc_mode(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_mm_nssai_inc_mode, @@ -1893,7 +1893,7 @@ de_nas_5gs_mm_pdu_ses_react_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pi { int curr_offset; - static const int * psi_0_7_flags[] = { + static int * const psi_0_7_flags[] = { &hf_nas_5gs_pdu_ses_rect_res_psi_7_b7, &hf_nas_5gs_pdu_ses_rect_res_psi_6_b6, &hf_nas_5gs_pdu_ses_rect_res_psi_5_b5, @@ -1905,7 +1905,7 @@ de_nas_5gs_mm_pdu_ses_react_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pi NULL }; - static const int * psi_8_15_flags[] = { + static int * const psi_8_15_flags[] = { &hf_nas_5gs_pdu_ses_rect_res_psi_15_b7, &hf_nas_5gs_pdu_ses_rect_res_psi_14_b6, &hf_nas_5gs_pdu_ses_rect_res_psi_13_b5, @@ -1967,7 +1967,7 @@ de_nas_5gs_mm_pdu_ses_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo { int curr_offset; - static const int * psi_0_7_flags[] = { + static int * const psi_0_7_flags[] = { &hf_nas_5gs_pdu_ses_sts_psi_7_b7, &hf_nas_5gs_pdu_ses_sts_psi_6_b6, &hf_nas_5gs_pdu_ses_sts_psi_5_b5, @@ -1979,7 +1979,7 @@ de_nas_5gs_mm_pdu_ses_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo NULL }; - static const int * psi_8_15_flags[] = { + static int * const psi_8_15_flags[] = { &hf_nas_5gs_pdu_ses_sts_psi_15_b7, &hf_nas_5gs_pdu_ses_sts_psi_14_b6, &hf_nas_5gs_pdu_ses_sts_psi_13_b5, @@ -2131,7 +2131,7 @@ de_nas_5gs_mm_sal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, proto_tree *sub_tree; proto_item *item; - static const int * flags_sal[] = { + static int * const flags_sal[] = { &hf_nas_5gs_mm_sal_al_t, &hf_nas_5gs_mm_sal_t_li, &hf_nas_5gs_mm_sal_num_e, @@ -2249,7 +2249,7 @@ de_nas_5gs_mm_sms_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_spare_b1, @@ -2286,7 +2286,7 @@ de_nas_5gs_mm_sor_trasp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo gchar *add_string _U_, int string_len _U_) { /* Layout differs depending on SOR data type*/ - static const int * flags_dt0[] = { + static int * const flags_dt0[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -2298,7 +2298,7 @@ de_nas_5gs_mm_sor_trasp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo NULL }; - static const int * flags_dt1[] = { + static int * const flags_dt1[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -2310,7 +2310,7 @@ de_nas_5gs_mm_sor_trasp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo NULL }; /* 3GPP TS 31.102 [22] subclause 4.2.5 */ - static const int * flags_acces_tech_1[] = { + static int * const flags_acces_tech_1[] = { &hf_nas_5gs_acces_tech_o1_b7, &hf_nas_5gs_acces_tech_o1_b6, &hf_nas_5gs_acces_tech_o1_b5, @@ -2322,7 +2322,7 @@ de_nas_5gs_mm_sor_trasp_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo NULL }; - static const int * flags_acces_tech_2[] = { + static int * const flags_acces_tech_2[] = { &hf_nas_5gs_acces_tech_o2_b7, &hf_nas_5gs_acces_tech_o2_b6, &hf_nas_5gs_acces_tech_o2_b5, @@ -2431,7 +2431,7 @@ de_nas_5gs_mm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ { guint32 curr_offset; - static const int * oct3_flags[] = { + static int * const oct3_flags[] = { &hf_nas_5gs_mm_5g_ea0, &hf_nas_5gs_mm_128_5g_ea1, &hf_nas_5gs_mm_128_5g_ea2, @@ -2443,7 +2443,7 @@ de_nas_5gs_mm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ NULL }; - static const int * oct4_flags[] = { + static int * const oct4_flags[] = { &hf_nas_5gs_mm_5g_ia0, &hf_nas_5gs_mm_5g_128_ia1, &hf_nas_5gs_mm_5g_128_ia2, @@ -2455,7 +2455,7 @@ de_nas_5gs_mm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ NULL }; - static const int * oct5_flags[] = { + static int * const oct5_flags[] = { &hf_nas_5gs_mm_eea0, &hf_nas_5gs_mm_128eea1, &hf_nas_5gs_mm_128eea2, @@ -2467,7 +2467,7 @@ de_nas_5gs_mm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ NULL }; - static const int * oct6_flags[] = { + static int * const oct6_flags[] = { &hf_nas_5gs_mm_eia0, &hf_nas_5gs_mm_128eia1, &hf_nas_5gs_mm_128eia2, @@ -2518,7 +2518,7 @@ de_nas_5gs_mm_ue_usage_set(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_spare_b1, @@ -2552,7 +2552,7 @@ de_nas_5gs_mm_ue_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -2586,7 +2586,7 @@ de_nas_5gs_mm_ul_data_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo { int curr_offset; - static const int * psi_0_7_flags[] = { + static int * const psi_0_7_flags[] = { &hf_nas_5gs_ul_data_sts_psi_7_b7, &hf_nas_5gs_ul_data_sts_psi_6_b6, &hf_nas_5gs_ul_data_sts_psi_5_b5, @@ -2598,7 +2598,7 @@ de_nas_5gs_mm_ul_data_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo NULL }; - static const int * psi_8_15_flags[] = { + static int * const psi_8_15_flags[] = { &hf_nas_5gs_ul_data_sts_psi_15_b7, &hf_nas_5gs_ul_data_sts_psi_14_b6, &hf_nas_5gs_ul_data_sts_psi_13_b5, @@ -2678,7 +2678,7 @@ de_nas_5gs_mm_cp_service_type(tvbuff_t* tvb, proto_tree* tree, packet_info* pinf guint32 offset, guint len _U_, gchar* add_string _U_, int string_len _U_) { - static const int* flags[] = { + static int* const flags[] = { &hf_nas_5gs_spare_b4, &hf_nas_5gs_mm_cp_service_type, NULL @@ -2709,7 +2709,7 @@ de_nas_5gs_sm_5gsm_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, { guint32 curr_offset = offset; - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -2804,7 +2804,7 @@ de_nas_5gs_sm_always_on_pdu_ses_ind(tvbuff_t *tvb, proto_tree *tree, packet_info guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_spare_b1, @@ -2825,7 +2825,7 @@ de_nas_5gs_sm_always_on_pdu_ses_req(tvbuff_t *tvb, proto_tree *tree, packet_info guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_spare_b2, &hf_nas_5gs_spare_b1, @@ -2848,7 +2848,7 @@ de_nas_5gs_sm_5gsm_allowed_ssc_mode(tvbuff_t *tvb, proto_tree *tree, packet_info gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b3, &hf_nas_5gs_sm_all_ssc_mode_b2, &hf_nas_5gs_sm_all_ssc_mode_b1, @@ -2940,7 +2940,7 @@ de_nas_5gs_sm_mapped_eps_b_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi curr_offset = offset; num_cont = 1; - static const int * mapd_eps_b_cont_flags[] = { + static int * const mapd_eps_b_cont_flags[] = { &hf_nas_5gs_sm_mapd_eps_b_cont_opt_code, &hf_nas_5gs_spare_b5, &hf_nas_5gs_sm_mapd_eps_b_cont_E, @@ -2948,7 +2948,7 @@ de_nas_5gs_sm_mapped_eps_b_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi NULL }; - static const int * mapd_eps_b_cont_flags_modify[] = { + static int * const mapd_eps_b_cont_flags_modify[] = { &hf_nas_5gs_sm_mapd_eps_b_cont_opt_code, &hf_nas_5gs_spare_b5, &hf_nas_5gs_sm_mapd_eps_b_cont_E_mod, @@ -3059,7 +3059,7 @@ de_nas_5gs_sm_max_num_sup_pkt_flt(tvbuff_t *tvb, proto_tree *tree, packet_info * guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_sm_max_nb_sup_pkt_flt_nb, &hf_nas_5gs_sm_max_nb_sup_pkt_flt_spare, NULL @@ -3190,7 +3190,7 @@ de_nas_5gs_sm_qos_flow_des(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ const char *unit_str; int hf_unit, hf_val; - static const int * param_flags[] = { + static int * const param_flags[] = { &hf_nas_5gs_sm_e, &hf_nas_5gs_sm_nof_params, NULL @@ -3355,7 +3355,7 @@ de_nas_5gs_sm_qos_rules(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 length, curr_offset, saved_offset, start_offset; guint8 num_pkt_flt, rop; - static const int * pkt_flt_flags[] = { + static int * const pkt_flt_flags[] = { &hf_nas_5gs_sm_rop, &hf_nas_5gs_sm_dqr, &hf_nas_5gs_sm_nof_pkt_filters, @@ -6124,7 +6124,7 @@ de_nas_5gs_updp_ue_policy_cm(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo guint32 offset, guint len, gchar* add_string _U_, int string_len _U_) { - static const int* flags_oct3[] = { + static int* const flags_oct3[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -6839,7 +6839,7 @@ de_nas_5gs_intra_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tree, p { int offset = 0; - static const int * flags[] = { + static int * const flags[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_spare_b6, &hf_nas_5gs_spare_b5, @@ -6872,7 +6872,7 @@ de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tr { int offset = 0; - static const int * oct8_flags[] = { + static int * const oct8_flags[] = { &hf_nas_5gs_spare_b7, &hf_nas_5gs_ncc, &hf_nas_5gs_mm_tsc, @@ -6880,7 +6880,7 @@ de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tr NULL }; - static const int * oct9_flags[] = { + static int * const oct9_flags[] = { &hf_nas_5gs_mm_5g_ea0, &hf_nas_5gs_mm_128_5g_ea1, &hf_nas_5gs_mm_128_5g_ea2, @@ -6892,7 +6892,7 @@ de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tr NULL }; - static const int * oct10_flags[] = { + static int * const oct10_flags[] = { &hf_nas_5gs_mm_5g_ia0, &hf_nas_5gs_mm_5g_128_ia1, &hf_nas_5gs_mm_5g_128_ia2, @@ -6904,7 +6904,7 @@ de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tr NULL }; - static const int * oct11_flags[] = { + static int * const oct11_flags[] = { &hf_nas_5gs_mm_eea0, &hf_nas_5gs_mm_128eea1, &hf_nas_5gs_mm_128eea2, @@ -6916,7 +6916,7 @@ de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tr NULL }; - static const int * oct12_flags[] = { + static int * const oct12_flags[] = { &hf_nas_5gs_mm_eia0, &hf_nas_5gs_mm_128eia1, &hf_nas_5gs_mm_128eia2, diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 8058c18f04..a6a5a68b08 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -1388,7 +1388,7 @@ de_emm_eps_net_feature_sup(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo _ { guint32 curr_offset; - static const int* oct3_flags[] = { + static int* const oct3_flags[] = { &hf_nas_eps_emm_cp_ciot, &hf_nas_eps_emm_er_wo_pdn, &hf_nas_eps_emm_esr_ps, @@ -1399,7 +1399,7 @@ de_emm_eps_net_feature_sup(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo _ NULL }; - static const int* oct4_flags[] = { + static int* const oct4_flags[] = { &hf_nas_eps_emm_15_bearers, &hf_nas_eps_emm_iwkn26, &hf_nas_eps_emm_restrict_dcnr, @@ -2032,7 +2032,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, { guint32 curr_offset; - static const int * oct3_flags[] = { + static int * const oct3_flags[] = { &hf_nas_eps_emm_eea0, &hf_nas_eps_emm_128eea1, &hf_nas_eps_emm_128eea2, @@ -2044,7 +2044,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct4_flags[] = { + static int * const oct4_flags[] = { &hf_nas_eps_emm_eia0, &hf_nas_eps_emm_128eia1, &hf_nas_eps_emm_128eia2, @@ -2056,7 +2056,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct5_flags[] = { + static int * const oct5_flags[] = { &hf_nas_eps_emm_uea0, &hf_nas_eps_emm_uea1, &hf_nas_eps_emm_uea2, @@ -2068,7 +2068,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct6_flags[] = { + static int * const oct6_flags[] = { &hf_nas_eps_emm_ucs2_supp, &hf_nas_eps_emm_uia1, &hf_nas_eps_emm_uia2, @@ -2080,7 +2080,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct7_flags[] = { + static int * const oct7_flags[] = { &hf_nas_eps_emm_prose_dd_cap, &hf_nas_eps_emm_prose_cap, &hf_nas_eps_emm_h245_ash_cap, @@ -2092,7 +2092,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct8_flags[] = { + static int * const oct8_flags[] = { &hf_nas_eps_emm_epco_cap, &hf_nas_eps_emm_hc_cp_ciot_cap, &hf_nas_eps_emm_er_wo_pdn_cap, @@ -2104,7 +2104,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct9_flags[] = { + static int * const oct9_flags[] = { &hf_nas_eps_15_bearers_cap, &hf_nas_eps_sgc_cap, &hf_nas_eps_n1mode_cap, @@ -2217,7 +2217,7 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, { guint32 curr_offset; - static const int * oct3_flags[] = { + static int * const oct3_flags[] = { &hf_nas_eps_emm_eea0, &hf_nas_eps_emm_128eea1, &hf_nas_eps_emm_128eea2, @@ -2229,7 +2229,7 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct4_flags[] = { + static int * const oct4_flags[] = { &hf_nas_eps_emm_eia0, &hf_nas_eps_emm_128eia1, &hf_nas_eps_emm_128eia2, @@ -2241,7 +2241,7 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct5_flags[] = { + static int * const oct5_flags[] = { &hf_nas_eps_emm_uea0, &hf_nas_eps_emm_uea1, &hf_nas_eps_emm_uea2, @@ -2253,7 +2253,7 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct6_flags[] = { + static int * const oct6_flags[] = { &hf_nas_eps_spare_b7, &hf_nas_eps_emm_uia1, &hf_nas_eps_emm_uia2, @@ -2265,7 +2265,7 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, NULL }; - static const int * oct7_flags[] = { + static int * const oct7_flags[] = { &hf_nas_eps_spare_b7, &hf_nas_eps_emm_gea1, &hf_nas_eps_emm_gea2, @@ -2618,7 +2618,7 @@ de_emm_ue_add_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g { guint32 curr_offset; - static const int * oct3_flags[] = { + static int * const oct3_flags[] = { &hf_nas_eps_emm_5g_ea0, &hf_nas_eps_emm_128_5g_ea1, &hf_nas_eps_emm_128_5g_ea2, @@ -2630,7 +2630,7 @@ de_emm_ue_add_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g NULL }; - static const int * oct4_flags[] = { + static int * const oct4_flags[] = { &hf_nas_eps_emm_5g_ea8, &hf_nas_eps_emm_5g_ea9, &hf_nas_eps_emm_5g_ea10, @@ -2642,7 +2642,7 @@ de_emm_ue_add_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g NULL }; - static const int * oct5_flags[] = { + static int * const oct5_flags[] = { &hf_nas_eps_emm_5g_ia0, &hf_nas_eps_emm_128_5g_ia1, &hf_nas_eps_emm_128_5g_ia2, @@ -2654,7 +2654,7 @@ de_emm_ue_add_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g NULL }; - static const int * oct6_flags[] = { + static int * const oct6_flags[] = { &hf_nas_eps_emm_5g_ia8, &hf_nas_eps_emm_5g_ia9, &hf_nas_eps_emm_5g_ia10, @@ -2725,7 +2725,7 @@ de_emm_ciph_key_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 proto_tree *sub_tree; while ((curr_offset - offset) < len) { - static const int * flags1[] = { + static int * const flags1[] = { &hf_emm_ciph_key_data_pos_sib_type_1_1, &hf_emm_ciph_key_data_pos_sib_type_1_2, &hf_emm_ciph_key_data_pos_sib_type_1_3, @@ -2736,7 +2736,7 @@ de_emm_ciph_key_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 &hf_emm_ciph_key_data_pos_sib_type_2_1, NULL }; - static const int * flags2[] = { + static int * const flags2[] = { &hf_emm_ciph_key_data_pos_sib_type_2_2, &hf_emm_ciph_key_data_pos_sib_type_2_3, &hf_emm_ciph_key_data_pos_sib_type_2_4, @@ -2747,7 +2747,7 @@ de_emm_ciph_key_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 &hf_emm_ciph_key_data_pos_sib_type_2_9, NULL }; - static const int * flags3[] = { + static int * const flags3[] = { &hf_emm_ciph_key_data_pos_sib_type_2_10, &hf_emm_ciph_key_data_pos_sib_type_2_11, &hf_emm_ciph_key_data_pos_sib_type_2_12, @@ -2758,7 +2758,7 @@ de_emm_ciph_key_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 &hf_emm_ciph_key_data_pos_sib_type_2_17, NULL }; - static const int * flags4[] = { + static int * const flags4[] = { &hf_emm_ciph_key_data_pos_sib_type_2_18, &hf_emm_ciph_key_data_pos_sib_type_2_19, &hf_emm_ciph_key_data_pos_sib_type_3_1, @@ -2826,7 +2826,7 @@ static guint16 de_emm_n1_ue_network_cap(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo _U_, guint32 offset, guint len _U_, gchar* add_string _U_, int string_len _U_) { - static const int* flags_oct1[] = { + static int* const flags_oct1[] = { &hf_nas_eps_spare_b7_b4, &hf_emm_5g_up_ciot_b3, &hf_emm_5g_hc_cp_ciot, @@ -3664,7 +3664,7 @@ de_esm_hdr_compr_config(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, { guint32 curr_offset = offset; - static const int * flags[] = { + static int * const flags[] = { &hf_nas_eps_spare_b7, &hf_nas_eps_esm_hdr_comp_config_prof_0104, &hf_nas_eps_esm_hdr_comp_config_prof_0103, @@ -3794,7 +3794,7 @@ static guint16 de_esm_hdr_compr_config_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nas_eps_esm_hdr_compr_config_status_ebi7, &hf_nas_eps_esm_hdr_compr_config_status_ebi6, &hf_nas_eps_esm_hdr_compr_config_status_ebi5, diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 91d93ffac4..8067e04b61 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -11509,7 +11509,7 @@ dissect_nbap_CommonPhysicalChannelID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * PreambleSignatures_bits[] = { +static int * const PreambleSignatures_bits[] = { &hf_nbap_PreambleSignatures_signature15, &hf_nbap_PreambleSignatures_signature14, &hf_nbap_PreambleSignatures_signature13, @@ -29166,7 +29166,7 @@ dissect_nbap_RACH_SlotFormat(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * RACH_SubChannelNumbers_bits[] = { +static int * const RACH_SubChannelNumbers_bits[] = { &hf_nbap_RACH_SubChannelNumbers_subCh11, &hf_nbap_RACH_SubChannelNumbers_subCh10, &hf_nbap_RACH_SubChannelNumbers_subCh9, diff --git a/epan/dissectors/packet-nbifom.c b/epan/dissectors/packet-nbifom.c index 4ba63b8646..c5ebae779b 100644 --- a/epan/dissectors/packet-nbifom.c +++ b/epan/dissectors/packet-nbifom.c @@ -177,13 +177,13 @@ dissect_nbifom_routing_rules(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint64 flags; while ((curr_offset - offset) < (gint)params_content_len) { - static const int *flags1[] = { + static int * const flags1[] = { &hf_nbifom_routing_rule_routing_access, &hf_nbifom_routing_rule_spare, &hf_nbifom_routing_rule_op_code, NULL }; - static const int *flags2[] = { + static int * const flags2[] = { &hf_nbifom_routing_rule_flags_prot_type_nxt_hdr, &hf_nbifom_routing_rule_flags_ipsec_spi, &hf_nbifom_routing_rule_flags_dst_addr_prefix_len, @@ -333,7 +333,7 @@ dissect_nbifom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ break; case 8: if (pinfo->link_dir == P2P_DIR_UL) { - static const int * flags[] = { + static int * const flags[] = { &hf_nbifom_param_contents_access_use_ind_spare, &hf_nbifom_param_contents_access_use_ind_wlan_access_usable_val, &hf_nbifom_param_contents_access_use_ind_3gpp_access_usable_val, diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c index 35c1340112..d393c615ee 100644 --- a/epan/dissectors/packet-nbt.c +++ b/epan/dissectors/packet-nbt.c @@ -507,7 +507,7 @@ static void nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, int offset, int is_wack) { guint16 flag; - static const int * req_flags[] = { + static int * const req_flags[] = { &hf_nbns_flags_response, &hf_nbns_flags_opcode, &hf_nbns_flags_truncated, @@ -516,7 +516,7 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in NULL }; - static const int * resp_flags[] = { + static int * const resp_flags[] = { &hf_nbns_flags_response, &hf_nbns_flags_opcode, &hf_nbns_flags_authoritative, @@ -528,7 +528,7 @@ nbns_add_nbns_flags(column_info *cinfo, proto_tree *nbns_tree, tvbuff_t *tvb, in NULL }; - static const int * resp_wack_flags[] = { + static int * const resp_wack_flags[] = { &hf_nbns_flags_response, &hf_nbns_flags_opcode, &hf_nbns_flags_authoritative, @@ -568,7 +568,7 @@ nbns_add_nb_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset) { proto_item *tf; gushort flag; - static const int * flags[] = { + static int * const flags[] = { &hf_nbns_nb_flags_group, &hf_nbns_nb_flags_ont, NULL @@ -585,7 +585,7 @@ nbns_add_nb_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset) static void nbns_add_name_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_nbns_name_flags_group, &hf_nbns_name_flags_ont, &hf_nbns_name_flags_drg, @@ -1118,7 +1118,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U int name_type; int len; - static const int * flags[] = { + static int * const flags[] = { &hf_nbdgm_fragment, &hf_nbdgm_first, &hf_nbdgm_node_type, @@ -1276,7 +1276,7 @@ dissect_nbss_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 error_code; tvbuff_t *next_tvb; const char *saved_proto; - static const int * nbss_flags[] = { + static int * const nbss_flags[] = { &hf_nbss_flags_e, NULL }; diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 11f5e7a08d..13a9eaa05d 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -1595,7 +1595,7 @@ static const value_string kernel_type_vals[] = { { 0, NULL } }; -static const int * ncp_pingflags1[] = { +static int * const ncp_pingflags1[] = { &hf_bit1pingflags1, &hf_bit2pingflags1, &hf_bit3pingflags1, @@ -1615,7 +1615,7 @@ static const int * ncp_pingflags1[] = { NULL }; -static const int * ncp_pingflags2[] = { +static int * const ncp_pingflags2[] = { &hf_bit1pingflags2, &hf_bit2pingflags2, &hf_bit3pingflags2, @@ -1635,7 +1635,7 @@ static const int * ncp_pingflags2[] = { NULL }; -static const int * ncp_pingvflags1[] = { +static int * const ncp_pingvflags1[] = { &hf_bit1pingvflags1, &hf_bit2pingvflags1, &hf_bit3pingvflags1, @@ -1655,7 +1655,7 @@ static const int * ncp_pingvflags1[] = { NULL }; -static const int * ncp_pingpflags1[] = { +static int * const ncp_pingpflags1[] = { &hf_bit1pingpflags1, &hf_bit2pingpflags1, &hf_bit3pingpflags1, @@ -1675,7 +1675,7 @@ static const int * ncp_pingpflags1[] = { NULL }; -static const int * ndsprotflags[] = { +static int * const ndsprotflags[] = { &hf_ndsprot1flag, &hf_ndsprot2flag, &hf_ndsprot3flag, @@ -1695,7 +1695,7 @@ static const int * ndsprotflags[] = { NULL }; -static const int * ncp_infoflagsl[] = { +static int * const ncp_infoflagsl[] = { &hf_bit1infoflagsl, &hf_bit2infoflagsl, &hf_bit3infoflagsl, @@ -1715,7 +1715,7 @@ static const int * ncp_infoflagsl[] = { NULL }; -static const int * ncp_infoflagsh[] = { +static int * const ncp_infoflagsh[] = { &hf_bit1infoflagsh, &hf_bit2infoflagsh, &hf_bit3infoflagsh, @@ -1735,7 +1735,7 @@ static const int * ncp_infoflagsh[] = { NULL }; -static const int * ncp_retinfoflagsh[] = { +static int * const ncp_retinfoflagsh[] = { &hf_bit1retinfoflagsh, &hf_bit2retinfoflagsh, &hf_bit3retinfoflagsh, @@ -1755,7 +1755,7 @@ static const int * ncp_retinfoflagsh[] = { NULL }; -static const int * ncp_acflags[] = { +static int * const ncp_acflags[] = { &hf_bit1acflags, &hf_bit2acflags, &hf_bit3acflags, @@ -1775,7 +1775,7 @@ static const int * ncp_acflags[] = { NULL }; -static const int * ncp_eflags[] = { +static int * const ncp_eflags[] = { &hf_bit1eflags, &hf_bit2eflags, &hf_bit3eflags, @@ -1795,7 +1795,7 @@ static const int * ncp_eflags[] = { NULL }; -static const int * ncp_cflags[] = { +static int * const ncp_cflags[] = { &hf_bit1cflags, &hf_bit2cflags, &hf_bit3cflags, @@ -1815,7 +1815,7 @@ static const int * ncp_cflags[] = { NULL }; -static const int * ncp_lflags[] = { +static int * const ncp_lflags[] = { &hf_bit1lflags, &hf_bit2lflags, &hf_bit3lflags, @@ -1835,7 +1835,7 @@ static const int * ncp_lflags[] = { NULL }; -static const int * ncp_nflags[] = { +static int * const ncp_nflags[] = { &hf_bit1nflags, &hf_bit2nflags, &hf_bit3nflags, @@ -1855,7 +1855,7 @@ static const int * ncp_nflags[] = { NULL }; -static const int * ncp_rflags[] = { +static int * const ncp_rflags[] = { &hf_bit1rflags, &hf_bit2rflags, &hf_bit3rflags, @@ -1875,7 +1875,7 @@ static const int * ncp_rflags[] = { NULL }; -static const int * ncp_outflags[] = { +static int * const ncp_outflags[] = { &hf_bit1outflags, &hf_bit2outflags, &hf_bit3outflags, @@ -1895,7 +1895,7 @@ static const int * ncp_outflags[] = { NULL }; -static const int * ncp_siflags[] = { +static int * const ncp_siflags[] = { &hf_bit1siflags, &hf_bit2siflags, &hf_bit3siflags, @@ -1915,7 +1915,7 @@ static const int * ncp_siflags[] = { NULL }; -static const int * ncp_vflags[] = { +static int * const ncp_vflags[] = { &hf_bit1vflags, &hf_bit2vflags, &hf_bit3vflags, @@ -1935,7 +1935,7 @@ static const int * ncp_vflags[] = { NULL }; -static const int * nds_bitflags[] = { +static int * const nds_bitflags[] = { &hf_nds_bit1, &hf_nds_bit2, &hf_nds_bit3, @@ -1955,7 +1955,7 @@ static const int * nds_bitflags[] = { NULL }; -static const int * ncp_l1flagsl[] = { +static int * const ncp_l1flagsl[] = { &hf_bit1l1flagsl, &hf_bit2l1flagsl, &hf_bit3l1flagsl, @@ -1975,7 +1975,7 @@ static const int * ncp_l1flagsl[] = { NULL }; -static const int * ncp_l1flagsh[] = { +static int * const ncp_l1flagsh[] = { &hf_bit1l1flagsh, &hf_bit2l1flagsh, &hf_bit3l1flagsh, @@ -3328,7 +3328,7 @@ print_nds_values(proto_tree *vtree, packet_info* pinfo, tvbuff_t *tvb, guint32 s /* Entry or Attribute Privileges */ if (entry_rights) { /* if Entries then use these bits */ - static const int * entries[] = { + static int * const entries[] = { &hf_nds_compare_attributes, &hf_nds_read_attribute, &hf_nds_write_add_delete_attribute, @@ -3353,7 +3353,7 @@ print_nds_values(proto_tree *vtree, packet_info* pinfo, tvbuff_t *tvb, guint32 s else { /* if attribute rights then do these bits */ - static const int * rights[] = { + static int * const rights[] = { &hf_nds_browse_entry, &hf_nds_add_entry, &hf_nds_delete_entry, diff --git a/epan/dissectors/packet-ncsi.c b/epan/dissectors/packet-ncsi.c index 9d0a94f652..62c9dcdb08 100644 --- a/epan/dissectors/packet-ncsi.c +++ b/epan/dissectors/packet-ncsi.c @@ -209,7 +209,7 @@ static const value_string ncsi_bf_filter_vals[] = { static void ncsi_proto_tree_add_lstat(tvbuff_t *tvb, proto_tree *tree, int offset) { - static const int *lstat_fields[] = { + static int * const lstat_fields[] = { &hf_ncsi_lstat_flag, &hf_ncsi_lstat_speed_duplex, &hf_ncsi_lstat_autoneg, @@ -260,7 +260,7 @@ dissect_ncsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *ncsi_tree, *ncsi_payload_tree; proto_item *ti, *pti; guint8 type, plen; - static const int *type_fields[] = { + static int * const type_fields[] = { &hf_ncsi_type_code, &hf_ncsi_type_resp, NULL, diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 7c30ecc149..716321f7ae 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -861,7 +861,7 @@ static int dissect_butype_attrs(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * attribute_flags[] = { + static int * const attribute_flags[] = { &hf_ndmp_butype_attr_recover_utf8, &hf_ndmp_butype_attr_backup_utf8, &hf_ndmp_butype_attr_recover_incremental, @@ -935,7 +935,7 @@ static int dissect_fs_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * invalid_flags[] = { + static int * const invalid_flags[] = { &hf_ndmp_fs_invalid_used_inodes, &hf_ndmp_fs_invalid_total_inodes, &hf_ndmp_fs_invalid_avail_size, @@ -1040,7 +1040,7 @@ static int dissect_tape_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * attribute_flags[] = { + static int * const attribute_flags[] = { &hf_ndmp_tape_attr_unload, &hf_ndmp_tape_attr_rewind, NULL @@ -1312,7 +1312,7 @@ static int dissect_execute_cdb_flags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * cdb_flags[] = { + static int * const cdb_flags[] = { &hf_ndmp_execute_cdb_flags_data_in, &hf_ndmp_execute_cdb_flags_data_out, NULL @@ -1601,7 +1601,7 @@ static int dissect_tape_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * invalid_tapes[] = { + static int * const invalid_tapes[] = { &hf_ndmp_tape_invalid_partition, &hf_ndmp_tape_invalid_space_remain, &hf_ndmp_tape_invalid_total_space, @@ -1638,7 +1638,7 @@ static int dissect_tape_flags(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * tape_flags[] = { + static int * const tape_flags[] = { &hf_ndmp_tape_flags_unload, &hf_ndmp_tape_flags_error, &hf_ndmp_tape_flags_write_protect, @@ -2341,7 +2341,7 @@ static int dissect_file_invalids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * invalid_files[] = { + static int * const invalid_files[] = { &hf_ndmp_file_invalid_group, &hf_ndmp_file_invalid_ctime, &hf_ndmp_file_invalid_atime, @@ -2639,7 +2639,7 @@ static int dissect_state_invalids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree) { - static const int * invalid_states[] = { + static int * const invalid_states[] = { &hf_ndmp_state_invalid_etr, &hf_ndmp_state_invalid_ebr, NULL diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 4bd8ff1294..abfcb1a4c8 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -147,7 +147,7 @@ static gint hf_netanalyzer_buf_state = -1; static gint hf_netanalyzer_buf_source = -1; static gint hf_netanalyzer_timetick = -1; -static const int *hfx_netanalyzer_status[] = { +static int * const hfx_netanalyzer_status[] = { &hf_netanalyzer_status_rx_err, &hf_netanalyzer_status_align_err, &hf_netanalyzer_status_fcs, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index d82749a2d9..c4a558e554 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -3675,7 +3675,7 @@ static const value_string special_nat_event_type[] = { {0, NULL } }; -static const int * tcp_flags[] = { +static int * const tcp_flags[] = { &hf_cflow_tcpflags_reserved, &hf_cflow_tcpflags_urg, &hf_cflow_tcpflags_ack, @@ -3686,7 +3686,7 @@ static const int * tcp_flags[] = { NULL }; -static const int * tcp_flags16[] = { +static int * const tcp_flags16[] = { &hf_cflow_tcpflags16_zero, &hf_cflow_tcpflags16_reserved, &hf_cflow_tcpflags16_ns, @@ -11545,10 +11545,10 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, /* --- Dissect Template ---*/ /* Template Fields Dissection */ -static const int *v9_template_type_hf_list[TF_NUM] = { +static int * const v9_template_type_hf_list[TF_NUM] = { &hf_cflow_template_scope_field_type, /* scope */ &hf_cflow_template_field_type}; /* entry */ -static const int *v10_template_type_hf_list[TF_NUM_EXT] = { +static int * const v10_template_type_hf_list[TF_NUM_EXT] = { &hf_cflow_template_ipfix_field_type, /* scope */ &hf_cflow_template_ipfix_field_type, &hf_cflow_template_plixer_field_type, diff --git a/epan/dissectors/packet-netlink-generic.c b/epan/dissectors/packet-netlink-generic.c index 76b30cec3d..85978a2322 100644 --- a/epan/dissectors/packet-netlink-generic.c +++ b/epan/dissectors/packet-netlink-generic.c @@ -169,7 +169,7 @@ static header_field_info hfi_genl_ctrl_op_flags_uns_admin_perm NETLINK_GENERIC_H { "GENL_UNS_ADMIN_PERM", "genl.ctrl.op_flags.uns_admin_perm", FT_BOOLEAN, 32, NULL, 0x10, NULL, HFILL }; -static const int *genl_ctrl_op_flags_fields[] = { +static int * const genl_ctrl_op_flags_fields[] = { &hfi_genl_ctrl_op_flags_admin_perm.id, &hfi_genl_ctrl_op_flags_cmd_cap_do.id, &hfi_genl_ctrl_op_flags_cmd_cap_dump.id, diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c index 06f77f8e46..f06966a27b 100644 --- a/epan/dissectors/packet-netlink-netfilter.c +++ b/epan/dissectors/packet-netlink-netfilter.c @@ -684,7 +684,7 @@ static header_field_info hfi_nfct_attr_status_flag_offload NETLINK_NETFILTER_HFI FT_UINT32, BASE_DEC, NULL, WS_IPS_OFFLOAD, NULL, HFILL }; -static const int *hfi_nfct_attr_status_flags[] = { +static int * const hfi_nfct_attr_status_flags[] = { &hfi_nfct_attr_status_flag_offload.id, &hfi_nfct_attr_status_flag_helper.id, &hfi_nfct_attr_status_flag_untracked.id, @@ -936,7 +936,7 @@ static header_field_info hfi_nfexp_attr_flag_userspace NETLINK_NETFILTER_HFI_INI FT_UINT32, BASE_DEC, NULL, WS_NF_CT_EXPECT_USERSPACE, NULL, HFILL }; -static const int *hfi_nfexp_attr_flags_bitfield[] = { +static int * const hfi_nfexp_attr_flags_bitfield[] = { &hfi_nfexp_attr_flag_userspace.id, &hfi_nfexp_attr_flag_inactive.id, &hfi_nfexp_attr_flag_permanent.id, diff --git a/epan/dissectors/packet-netlink.c b/epan/dissectors/packet-netlink.c index bf048d32ef..099640ffe0 100644 --- a/epan/dissectors/packet-netlink.c +++ b/epan/dissectors/packet-netlink.c @@ -195,7 +195,7 @@ static gint ett_netlink_attr_type = -1; static dissector_table_t netlink_dissector_table; -static const int *netlink_header_get_flags[] = { +static int * const netlink_header_get_flags[] = { &hfi_netlink_hdr_flag_request.id, &hfi_netlink_hdr_flag_multi.id, &hfi_netlink_hdr_flag_ack.id, @@ -209,7 +209,7 @@ static const int *netlink_header_get_flags[] = { NULL }; -static const int *netlink_header_new_flags[] = { +static int * const netlink_header_new_flags[] = { &hfi_netlink_hdr_flag_request.id, &hfi_netlink_hdr_flag_multi.id, &hfi_netlink_hdr_flag_ack.id, @@ -224,7 +224,7 @@ static const int *netlink_header_new_flags[] = { NULL }; -static const int *netlink_header_standard_flags[] = { +static int * const netlink_header_standard_flags[] = { &hfi_netlink_hdr_flag_request.id, &hfi_netlink_hdr_flag_multi.id, &hfi_netlink_hdr_flag_ack.id, diff --git a/epan/dissectors/packet-netmon.c b/epan/dissectors/packet-netmon.c index 3dc3f27ec2..c9bb661973 100644 --- a/epan/dissectors/packet-netmon.c +++ b/epan/dissectors/packet-netmon.c @@ -463,7 +463,7 @@ dissect_netmon_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* tvbuff_t *provider_id_tvb; guid_key provider_guid; struct netmon_provider_id_data provider_id_data; - static const int * event_flags[] = { + static int * const event_flags[] = { &hf_netmon_event_flags_extended_info, &hf_netmon_event_flags_private_session, &hf_netmon_event_flags_string_only, @@ -474,7 +474,7 @@ dissect_netmon_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* &hf_netmon_event_flags_classic_header, NULL }; - static const int * event_property[] = { + static int * const event_property[] = { &hf_netmon_event_event_property_xml, &hf_netmon_event_event_property_forwarded_xml, &hf_netmon_event_event_property_legacy_eventlog, diff --git a/epan/dissectors/packet-nfapi.c b/epan/dissectors/packet-nfapi.c index 5c96d4dd98..46ebf7d69e 100644 --- a/epan/dissectors/packet-nfapi.c +++ b/epan/dissectors/packet-nfapi.c @@ -1475,7 +1475,7 @@ static const value_string message_id_vals[] = static dissector_handle_t nfapi_handle; static dissector_table_t message_table; -static const int * dl_bandwidth_support_fields[] = { +static int * const dl_bandwidth_support_fields[] = { &hf_nfapi_dl_bandwidth_support_6, &hf_nfapi_dl_bandwidth_support_15, &hf_nfapi_dl_bandwidth_support_25, @@ -1485,7 +1485,7 @@ static const int * dl_bandwidth_support_fields[] = { NULL }; -static const int * ul_bandwidth_support_fields[] = { +static int * const ul_bandwidth_support_fields[] = { &hf_nfapi_ul_bandwidth_support_6, &hf_nfapi_ul_bandwidth_support_15, &hf_nfapi_ul_bandwidth_support_25, @@ -1495,7 +1495,7 @@ static const int * ul_bandwidth_support_fields[] = { NULL }; -static const int * maximum_3gpp_release_supported_fields[] = { +static int * const maximum_3gpp_release_supported_fields[] = { &hf_nfapi_maximum_3gpp_release_supported_rel8, &hf_nfapi_maximum_3gpp_release_supported_rel9, &hf_nfapi_maximum_3gpp_release_supported_rel10, @@ -2847,7 +2847,7 @@ static void dissect_ul_bandwidth_support_value(ptvcursor_t * ptvc, packet_info* } static void dissect_dl_modulation_value(ptvcursor_t * ptvc, packet_info* pinfo) { - static const int * dl_modulation_support_fields[] = { + static int * const dl_modulation_support_fields[] = { &hf_nfapi_dl_modulation_support_qpsk, &hf_nfapi_dl_modulation_support_16qam, &hf_nfapi_dl_modulation_support_64qam, @@ -2868,7 +2868,7 @@ static void dissect_dl_modulation_value(ptvcursor_t * ptvc, packet_info* pinfo) } static void dissect_ul_modulation_value(ptvcursor_t * ptvc, packet_info* pinfo) { - static const int * ul_modulation_support_fields[] = { + static int * const ul_modulation_support_fields[] = { &hf_nfapi_ul_modulation_support_qpsk, &hf_nfapi_ul_modulation_support_16qam, &hf_nfapi_ul_modulation_support_64qam, @@ -8272,7 +8272,7 @@ static int dissect_p7_header(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_tree *header_tree; int offset = 0; guint8 m_seg; - static const int *fields[] = { + static int * const fields[] = { &hf_nfapi_p7_message_header_m, &hf_nfapi_p7_message_header_segment, NULL diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index af286bd889..a502b03ec3 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -1448,7 +1448,7 @@ dissect_fhandle_data_SVR4(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree *tre guint32 len2; guint32 fhlen; /* File handle length. */ - static const int * fsid_fields[] = { + static int * const fsid_fields[] = { &hf_nfs_fh_fsid_major32, &hf_nfs_fh_fsid_minor32, NULL @@ -1690,7 +1690,7 @@ static int dissect_fhandle_data_NETAPP(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { int offset = 0; - static const int * flags[] = { + static int * const flags[] = { &hf_nfs_fh_file_flag_mntpoint, &hf_nfs_fh_file_flag_snapdir, &hf_nfs_fh_file_flag_snapdir_ent, @@ -1752,7 +1752,7 @@ static const value_string handle_type_strings[] = { static int dissect_fhandle_data_NETAPP_V4(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_nfs_fh_file_flag_mntpoint, &hf_nfs_fh_file_flag_snapdir, &hf_nfs_fh_file_flag_snapdir_ent, @@ -1830,7 +1830,7 @@ dissect_fhandle_data_NETAPP_GX_v3(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t proto_tree *field_tree; guint8 flags; guint32 offset = 0; - static const int * fh_flags[] = { + static int * const fh_flags[] = { &hf_nfs3_gxfh_sfhflags_resv1, &hf_nfs3_gxfh_sfhflags_resv2, &hf_nfs3_gxfh_sfhflags_ontapGX, @@ -1842,7 +1842,7 @@ dissect_fhandle_data_NETAPP_GX_v3(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t NULL }; - static const int * fh_flags_ontap[] = { + static int * const fh_flags_ontap[] = { &hf_nfs3_gxfh_sfhflags_resv1, &hf_nfs3_gxfh_sfhflags_resv2, &hf_nfs3_gxfh_sfhflags_ontap7G, @@ -1854,7 +1854,7 @@ dissect_fhandle_data_NETAPP_GX_v3(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t NULL }; - static const int * utility_flags[] = { + static int * const utility_flags[] = { &hf_nfs3_gxfh_utlfield_tree, &hf_nfs3_gxfh_utlfield_jun, &hf_nfs3_gxfh_utlfield_ver, @@ -2167,19 +2167,19 @@ dissect_fhandle_data_PRIMARY_DATA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_t int offset = 0; guint32 version; - static const int *fh_flags[] = { + static int * const fh_flags[] = { &hf_nfs4_fh_pd_flags_version, &hf_nfs4_fh_pd_flags_reserved, NULL }; - static const int *fh_sites[] = { + static int * const fh_sites[] = { &hf_nfs4_fh_pd_sites_inum, &hf_nfs4_fh_pd_sites_siteid, NULL }; - static const int *fh_spaces[] = { + static int * const fh_spaces[] = { &hf_nfs4_fh_pd_spaces_snapid, &hf_nfs4_fh_pd_spaces_container, NULL @@ -2775,7 +2775,7 @@ static const value_string nfs2_mode_names[] = { static int dissect_nfs2_mode(tvbuff_t *tvb, int offset, proto_tree *tree) { - static const int *modes[] = { + static int * const modes[] = { &hf_nfs2_mode_name, &hf_nfs2_mode_set_user_id, &hf_nfs2_mode_set_group_id, @@ -3609,7 +3609,7 @@ dissect_nfs3_write_verf(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_nfs3_mode(tvbuff_t *tvb, int offset, proto_tree *tree, guint32 *mode) { - static const int *mode_bits[] = { + static int * const mode_bits[] = { &hf_nfs3_mode_suid, &hf_nfs3_mode_sgid, &hf_nfs3_mode_sticky, @@ -5796,7 +5796,7 @@ static int dissect_nfs3_fsinfo_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_) { guint32 status; - static const int *properties[] = { + static int * const properties[] = { &hf_nfs3_fsinfo_properties_setattr, &hf_nfs3_fsinfo_properties_pathconf, &hf_nfs3_fsinfo_properties_symlinks, @@ -6674,7 +6674,7 @@ static const value_string names_acetype4[] = { static int dissect_nfs_aceflags4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *ace_tree) { - static const int *flags[] = { + static int * const flags[] = { &hf_nfs4_aceflag_file_inherit, &hf_nfs4_aceflag_dir_inherit, &hf_nfs4_aceflag_no_prop_inherit, @@ -6884,7 +6884,7 @@ dissect_nfs4_ace(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree * #define ACL4_PROTECTED 0x00000002 #define ACL4_DEFAULTED 0x00000004 -static const int *aclflags_fields[] = { +static int * const aclflags_fields[] = { &hf_nfs4_aclflag_auto_inherit, &hf_nfs4_aclflag_protected, &hf_nfs4_aclflag_defaulted, @@ -6930,7 +6930,7 @@ dissect_nfs4_fattr_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item #define ACL4_SUPPORT_AUDIT_ACL 0x00000004 #define ACL4_SUPPORT_ALARM_ACL 0x00000008 -static const int *aclsupport_fields[] = { +static int * const aclsupport_fields[] = { &hf_nfs4_aclsupport_allow_acl, &hf_nfs4_aclsupport_deny_acl, &hf_nfs4_aclsupport_audit_acl, @@ -7012,7 +7012,7 @@ static const value_string nfs4_fattr4_fh_expire_type_names[] = { { 0, NULL } }; -static const int *nfs4_fattr_fh_expire_type_fields[] = { +static int * const nfs4_fattr_fh_expire_type_fields[] = { &hf_nfs4_fattr_fh_expiry_noexpire_with_open, &hf_nfs4_fattr_fh_expiry_volatile_any, &hf_nfs4_fattr_fh_expiry_vol_migration, @@ -8164,7 +8164,7 @@ dissect_nfs4_lockdenied(tvbuff_t *tvb, int offset, proto_tree *tree) #define OPEN4_RESULT_PRESERVE_UNLINKED 0x00000008 #define OPEN4_RESULT_MAY_NOTIFY_LOCK 0x00000020 -static const int *open4_result_flag_fields[] = { +static int * const open4_result_flag_fields[] = { &hf_nfs4_open_rflags_confirm, &hf_nfs4_open_rflags_locktype_posix, &hf_nfs4_open_rflags_preserve_unlinked, @@ -9446,7 +9446,7 @@ dissect_nfs4_layoutget(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree *nfl_item; proto_tree *nfl_tree; - static const int * layout_flags[] = { + static int * const layout_flags[] = { &hf_nfs4_ff_layout_flags_no_layoutcommit, &hf_nfs4_ff_layout_flags_no_io_thru_mds, &hf_nfs4_ff_layout_flags_no_read_io, @@ -9613,7 +9613,7 @@ dissect_nfs4_layoutget(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_nfs_create_session_flags(tvbuff_t *tvb, int offset, proto_tree *tree, int hf_csa) { - const int * flags[] = { + int * const flags[] = { &hf_nfs4_create_session_flags_persist, &hf_nfs4_create_session_flags_conn_back_chan, &hf_nfs4_create_session_flags_conn_rdma, @@ -9775,7 +9775,7 @@ static int nfs4_operation_tiers[] = { #define NFS4_OPERATION_TIER(op) \ ((op) < G_N_ELEMENTS(nfs4_operation_tiers) ? nfs4_operation_tiers[(op)] : 0) -static const int * nfs4_exchid_flags[] = { +static int * const nfs4_exchid_flags[] = { &hf_nfs4_exchid_flags_confirmed_r, &hf_nfs4_exchid_flags_upd_conf_rec_a, &hf_nfs4_exchid_flags_pnfs_ds, @@ -10914,7 +10914,7 @@ dissect_nfs4_response_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr case NFS4_OP_SEQUENCE: { - static const int * sequence_flags[] = { + static int * const sequence_flags[] = { &hf_nfs4_sequence_status_flags_cb_path_down, &hf_nfs4_sequence_status_flags_cb_gss_contexts_expiring, &hf_nfs4_sequence_status_flags_cb_gss_contexts_expired, diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index ef1a70411a..94d9bbf79c 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -5811,7 +5811,7 @@ dissect_ngap_EUTRAencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_c 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_EUTRAencryptionAlgorithms_eea1, &hf_ngap_EUTRAencryptionAlgorithms_eea2, &hf_ngap_EUTRAencryptionAlgorithms_eea3, @@ -5837,7 +5837,7 @@ dissect_ngap_EUTRAintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_EUTRAintegrityProtectionAlgorithms_eia1, &hf_ngap_EUTRAintegrityProtectionAlgorithms_eia2, &hf_ngap_EUTRAintegrityProtectionAlgorithms_eia3, @@ -6332,7 +6332,7 @@ dissect_ngap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_InterfacesToTrace_NG_C, &hf_ngap_InterfacesToTrace_Xn_C, &hf_ngap_InterfacesToTrace_Uu, @@ -6586,7 +6586,7 @@ dissect_ngap_RATRestrictionInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_c 8, 8, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_RATRestrictionInformation_e_UTRA, &hf_ngap_RATRestrictionInformation_nR, &hf_ngap_RATRestrictionInformation_reserved, @@ -6905,7 +6905,7 @@ dissect_ngap_NRencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_NrencyptionAlgorithms_nea1, &hf_ngap_NrencyptionAlgorithms_nea2, &hf_ngap_NrencyptionAlgorithms_nea3, @@ -6931,7 +6931,7 @@ dissect_ngap_NRintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_ngap_NrintegrityProtectionAlgorithms_nia1, &hf_ngap_NrintegrityProtectionAlgorithms_nia2, &hf_ngap_NrintegrityProtectionAlgorithms_nia3, diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 9beafb0324..13e0c92070 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -595,7 +595,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, case NHRP_RESOLUTION_REQ: case NHRP_RESOLUTION_REPLY: { - static const int * flags[] = { + static int * const flags[] = { &hf_nhrp_flag_Q, &hf_nhrp_flag_A, &hf_nhrp_flag_D, @@ -610,7 +610,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, case NHRP_REGISTRATION_REQ: case NHRP_REGISTRATION_REPLY: { - static const int * flags[] = { + static int * const flags[] = { &hf_nhrp_flag_U2, &hf_nhrp_flag_NAT, NULL @@ -622,7 +622,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, case NHRP_PURGE_REQ: case NHRP_PURGE_REPLY: { - static const int * flags[] = { + static int * const flags[] = { &hf_nhrp_flag_N, &hf_nhrp_flag_NAT, NULL @@ -632,7 +632,7 @@ static void dissect_nhrp_mand(tvbuff_t *tvb, break; default: { - static const int * flags[] = { + static int * const flags[] = { &hf_nhrp_flag_NAT, NULL }; diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 2fb0bfd7ef..0b189cb01b 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -299,7 +299,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre static int dissect_access_rights(tvbuff_t *tvb, int offset, proto_tree *tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_nisplus_mask_world_read, &hf_nisplus_mask_world_modify, &hf_nisplus_mask_world_create, @@ -331,7 +331,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre proto_item* lock_item; proto_tree* lock_tree; int old_offset = offset; - static const int * flags[] = { + static int * const flags[] = { &hf_nisplus_table_col_mask_binary, &hf_nisplus_table_col_mask_encrypted, &hf_nisplus_table_col_mask_xdr, @@ -396,7 +396,7 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre proto_item* lock_item; proto_tree* lock_tree; int old_offset = offset; - static const int * flags[] = { + static int * const flags[] = { &hf_nisplus_entry_mask_binary, &hf_nisplus_entry_mask_crypt, &hf_nisplus_entry_mask_xdr, diff --git a/epan/dissectors/packet-ns-ha.c b/epan/dissectors/packet-ns-ha.c index f69794fe90..840070d91b 100644 --- a/epan/dissectors/packet-ns-ha.c +++ b/epan/dissectors/packet-ns-ha.c @@ -97,7 +97,7 @@ static const value_string ns_ha_syncstate_vals[] = { #define NSAHA_STAY_PRIMARY 0x4000 #define NSAHA_VERSION_MISMATCH 0x8000 -static const int * ha_flags[] = { +static int * const ha_flags[] = { &hf_nsha_flags_vm, &hf_nsha_flags_sp, &hf_nsha_flags_inc, diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 722fa4d7b0..fe39826d22 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -146,7 +146,7 @@ dissect_ns_cert_exts_CertRenewalUrl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * CertType_bits[] = { +static int * const CertType_bits[] = { &hf_ns_cert_exts_CertType_ssl_client, &hf_ns_cert_exts_CertType_ssl_server, &hf_ns_cert_exts_CertType_smime, diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index e545804a98..4446efe3b7 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -491,7 +491,7 @@ decode_iei_num_ip6_endpoints(nsip_ie_t *ie, build_info_t *bi, int ie_start_offse static void decode_iei_reset_flag(nsip_ie_t *ie _U_, build_info_t *bi, int ie_start_offset _U_) { guint8 flag; - static const int * reset_flags[] = { + static int * const reset_flags[] = { &hf_nsip_reset_flag_bit, &hf_nsip_reset_flag_spare, NULL @@ -550,7 +550,7 @@ decode_iei_transaction_id(nsip_ie_t *ie, build_info_t *bi, int ie_start_offset) static void decode_iei_end_flag(nsip_ie_t *ie _U_, build_info_t *bi, int ie_start_offset) { - static const int * end_flags[] = { + static int * const end_flags[] = { &hf_nsip_end_flag_bit, &hf_nsip_end_flag_spare, NULL @@ -564,7 +564,7 @@ decode_iei_end_flag(nsip_ie_t *ie _U_, build_info_t *bi, int ie_start_offset) { static void decode_iei_control_bits(nsip_ie_t *ie _U_, build_info_t *bi, int ie_start_offset) { guint8 control_bits; - static const int * flags[] = { + static int * const flags[] = { &hf_nsip_control_bits_r, &hf_nsip_control_bits_c, &hf_nsip_control_bits_spare, diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index 894a6d1133..26e1d345fa 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -468,7 +468,7 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint8 src_vmname_len = 0, dst_vmname_len = 0; guint8 variable_ns_len = 0; guint32 vlan; - static const int * activity_flags[] = { + static int * const activity_flags[] = { &hf_ns_activity_perf_collection, &hf_ns_activity_pcb_zombie, &hf_ns_activity_natpcb_zombie, @@ -522,7 +522,7 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case NSPR_HEADER_VERSION204: { - static const int * clflags[] = { + static int * const clflags[] = { &hf_ns_clflags_res, &hf_ns_clflags_rssh, &hf_ns_clflags_rss, @@ -561,7 +561,7 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data case NSPR_HEADER_VERSION350: { - static const int * cap_flags[] = { + static int * const cap_flags[] = { &hf_ns_capflags_dbg, &hf_ns_capflags_int, &hf_ns_capflags_skipnwhdr, @@ -638,7 +638,7 @@ void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tre proto_tree* subtree; proto_item* subitem; unsigned int tcp_mode = 0; - static const int * cluster_flags[] = { + static int * const cluster_flags[] = { &hf_ns_clu_clflags_fp, &hf_ns_clu_clflags_fr, &hf_ns_clu_clflags_dfd, diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index 6803d7c809..1af0aeacee 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -95,7 +95,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint8 version, type; guint16 id, cport; - static const int * tpcp_flags[] = { + static int * const tpcp_flags[] = { &hf_tpcp_flags_tcp, &hf_tpcp_flags_redir, &hf_tpcp_flags_xon, diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 241596208e..f793ee5b0c 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1213,7 +1213,7 @@ dissect_ntlmssp_blob (tvbuff_t *tvb, packet_info *pinfo, return offset; } -static const int * ntlmssp_negotiate_flags[] = { +static int * const ntlmssp_negotiate_flags[] = { &hf_ntlmssp_negotiate_flags_80000000, &hf_ntlmssp_negotiate_flags_40000000, &hf_ntlmssp_negotiate_flags_20000000, diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 256582e37c..9be232de4b 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -937,7 +937,7 @@ static const char *mon_names[12] = { "Dec" }; -static const int *ntp_header_fields[] = { +static int * const ntp_header_fields[] = { &hf_ntp_flags_li, &hf_ntp_flags_vn, &hf_ntp_flags_mode, @@ -952,7 +952,7 @@ static const int *ntp_header_fields[] = { * | Status | Sel | Count | Code | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ -static const int *peer_status_flags[] = { +static int * const peer_status_flags[] = { &hf_ntpctrl_peer_status_b0, &hf_ntpctrl_peer_status_b1, &hf_ntpctrl_peer_status_b2, @@ -964,7 +964,7 @@ static const int *peer_status_flags[] = { NULL }; -static const int *ntppriv_peer_list_flags[] = { +static int * const ntppriv_peer_list_flags[] = { &hf_ntppriv_mode7_peer_flags_config, &hf_ntppriv_mode7_peer_flags_syspeer, &hf_ntppriv_mode7_peer_flags_burst, @@ -976,7 +976,7 @@ static const int *ntppriv_peer_list_flags[] = { NULL }; -static const int *ntppriv_config_flags[] = { +static int * const ntppriv_config_flags[] = { &hf_ntppriv_mode7_config_flags_auth, &hf_ntppriv_mode7_config_flags_prefer, &hf_ntppriv_mode7_config_flags_burst, @@ -986,7 +986,7 @@ static const int *ntppriv_config_flags[] = { NULL }; -static const int *ntppriv_sys_flag_flags[] = { +static int * const ntppriv_sys_flag_flags[] = { &hf_ntppriv_mode7_sys_flags_bclient, &hf_ntppriv_mode7_sys_flags_pps, &hf_ntppriv_mode7_sys_flags_ntp, @@ -998,7 +998,7 @@ static const int *ntppriv_sys_flag_flags[] = { NULL }; -static const int *ntppriv_reset_stats_flags[] = { +static int * const ntppriv_reset_stats_flags[] = { &hf_ntppriv_mode7_reset_stats_flags_allpeers, &hf_ntppriv_mode7_reset_stats_flags_io, &hf_ntppriv_mode7_reset_stats_flags_sys, @@ -1385,7 +1385,7 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt tvbparse_t *tt; tvbparse_elem_t *element; - static const int *ntpctrl_flags[] = { + static int * const ntpctrl_flags[] = { &hf_ntpctrl_flags2_r, &hf_ntpctrl_flags2_error, &hf_ntpctrl_flags2_more, @@ -1434,7 +1434,7 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt * | Error Code | reserved | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - static const int *errorstatus[] = { + static int * const errorstatus[] = { &hf_ntpctrl_error_status_word, NULL }; @@ -1460,7 +1460,7 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt * |LI | ClkSource | Count | Code | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - static const int *systemstatus[] = { + static int * const systemstatus[] = { &hf_ntpctrl_sys_status_li, &hf_ntpctrl_sys_status_clksrc, &hf_ntpctrl_sys_status_count, @@ -1482,7 +1482,7 @@ dissect_ntp_ctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt * | Clock Status | Event Code | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - static const int *clockstatus[] = { + static int * const clockstatus[] = { &hf_ntpctrl_clk_status, &hf_ntpctrl_clk_status_code, NULL @@ -1681,7 +1681,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt wmem_tree_key_t key[3]; guint32 seq; - static const int *priv_flags[] = { + static int * const priv_flags[] = { &hf_ntppriv_flags_r, &hf_ntppriv_flags_more, &hf_ntp_flags_vn, @@ -1689,7 +1689,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, nt NULL }; - static const int *auth_flags[] = { + static int * const auth_flags[] = { &hf_ntppriv_auth, &hf_ntppriv_seq, NULL diff --git a/epan/dissectors/packet-nvme-tcp.c b/epan/dissectors/packet-nvme-tcp.c index ebc1aecf84..e8f895e844 100644 --- a/epan/dissectors/packet-nvme-tcp.c +++ b/epan/dissectors/packet-nvme-tcp.c @@ -183,7 +183,7 @@ static int hf_pdu_flags_ddgst = -1; static int hf_pdu_flags_data_last = -1; static int hf_pdu_flags_data_success = -1; -static const int *nvme_tcp_pdu_flags[] = { +static int * const nvme_tcp_pdu_flags[] = { &hf_pdu_flags_hdgst, &hf_pdu_flags_ddgst, &hf_pdu_flags_data_last, diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c index 9a9e66defe..8bfc98a608 100644 --- a/epan/dissectors/packet-oampdu.c +++ b/epan/dissectors/packet-oampdu.c @@ -1002,7 +1002,7 @@ dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree *oampdu_tree; proto_item *oampdu_item; - static const int * oampdu_flags[] = { + static int * const oampdu_flags[] = { &hf_oampdu_flags_link_fault, &hf_oampdu_flags_dying_gasp, &hf_oampdu_flags_critical_event, @@ -1120,12 +1120,12 @@ dissect_oampdu_information(tvbuff_t *tvb, proto_tree *tree) if ((info_type==OAMPDU_INFO_TYPE_LOCAL)||(info_type==OAMPDU_INFO_TYPE_REMOTE)) { - static const int * info_states[] = { + static int * const info_states[] = { &hf_oampdu_info_state_parser, &hf_oampdu_info_state_mux, NULL }; - static const int * info_config[] = { + static int * const info_config[] = { &hf_oampdu_info_oamConfig_mode, &hf_oampdu_info_oamConfig_uni, &hf_oampdu_info_oamConfig_lpbk, @@ -1601,7 +1601,7 @@ dissect_oampdu_loopback_control(tvbuff_t *tvb, proto_tree *tree) guint32 offset; guint16 bytes; - static const int * ctrl[] = { + static int * const ctrl[] = { &hf_oampdu_lpbk_enable, &hf_oampdu_lpbk_disable, NULL @@ -1617,7 +1617,7 @@ dissect_oampdu_loopback_control(tvbuff_t *tvb, proto_tree *tree) } } -static const int *s1_autoneg_mode_bits[] = { +static int * const s1_autoneg_mode_bits[] = { &hf_oam_dpoe_s1_autoneg_hd, &hf_oam_dpoe_s1_autoneg_fd, &hf_oam_dpoe_s1_autoneg_10, diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index 2d0c25c075..2dba429441 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -250,20 +250,20 @@ static int hf_current_path = -1; static int hf_request_in_frame = -1; static int hf_response_in_frame = -1; -static const int *hfx_hdr_id[] = { +static int * const hfx_hdr_id[] = { &hf_hdr_id_encoding, &hf_hdr_id_meaning, NULL }; -static const int *hfx_pbap_application_parameter_data_filter_1[] = { +static int * const hfx_pbap_application_parameter_data_filter_1[] = { &hf_pbap_application_parameter_data_filter_reserved_32_38, &hf_pbap_application_parameter_data_filter_proprietary_filter, &hf_pbap_application_parameter_data_filter_reserved_for_proprietary_filter_usage, NULL }; -static const int *hfx_pbap_application_parameter_data_filter_0[] = { +static int * const hfx_pbap_application_parameter_data_filter_0[] = { &hf_pbap_application_parameter_data_filter_version, &hf_pbap_application_parameter_data_filter_fn, &hf_pbap_application_parameter_data_filter_n, @@ -297,7 +297,7 @@ static const int *hfx_pbap_application_parameter_data_filter_0[] = { NULL }; -static const int *hfx_pbap_application_parameter_data_supported_features[] = { +static int * const hfx_pbap_application_parameter_data_supported_features[] = { &hf_pbap_application_parameter_data_supported_features_reserved, &hf_pbap_application_parameter_data_supported_features_default_contact_image_format, &hf_pbap_application_parameter_data_supported_features_contact_referencing, @@ -312,7 +312,7 @@ static const int *hfx_pbap_application_parameter_data_supported_features[] = { NULL }; -static const int *hfx_ctn_application_parameter_data_parameter_mask[] = { +static int * const hfx_ctn_application_parameter_data_parameter_mask[] = { &hf_ctn_application_parameter_data_parameter_mask_reserved, &hf_ctn_application_parameter_data_parameter_mask_recurrent, &hf_ctn_application_parameter_data_parameter_mask_send_status, diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c index be39c46267..23551e0995 100644 --- a/epan/dissectors/packet-ocfs2.c +++ b/epan/dissectors/packet-ocfs2.c @@ -447,7 +447,7 @@ static int dlm_cookie_handler(proto_tree *tree, tvbuff_t *tvb, guint offset, int static int dlm_lkm_flags_handler(proto_tree *tree, tvbuff_t *tvb, guint offset, guint32 *dlm_lock_flags_ptr) { - static const int *flags[] = { + static int * const flags[] = { &hf_dlm_lock_flag_unused1, &hf_dlm_lock_flag_orphan, &hf_dlm_lock_flag_parentable, @@ -538,7 +538,7 @@ static void dissect_dlm_migrate_lockres(proto_tree *tree, tvbuff_t *tvb, int off unsigned int i; guint32 num_locks; - static const int * mres_flags[] = { + static int * const mres_flags[] = { &hf_dlm_mres_flag_recovery, &hf_dlm_mres_flag_migration, &hf_dlm_mres_flag_all_done, diff --git a/epan/dissectors/packet-oer.c b/epan/dissectors/packet-oer.c index e61de587b9..13881cc3d1 100644 --- a/epan/dissectors/packet-oer.c +++ b/epan/dissectors/packet-oer.c @@ -382,7 +382,7 @@ dissect_oer_enumerated(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tr * If the lower and upper bounds of the effective size constraint are identical, 13.2 applies, otherwise 13.3 applies. */ guint32 -dissect_oer_bit_string(tvbuff_t *tvb, guint32 offset _U_, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_, int min_len _U_, int max_len _U_, gboolean has_extension _U_, const int **named_bits _U_, gint num_named_bits _U_, tvbuff_t **value_tvb _U_, int *len _U_) +dissect_oer_bit_string(tvbuff_t *tvb, guint32 offset _U_, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_, int min_len _U_, int max_len _U_, gboolean has_extension _U_, int * const *named_bits _U_, gint num_named_bits _U_, tvbuff_t **value_tvb _U_, int *len _U_) { dissect_oer_not_decoded_yet(tree, actx->pinfo, tvb, "Encoding of bitstring values not handled yet"); diff --git a/epan/dissectors/packet-oer.h b/epan/dissectors/packet-oer.h index 5f2ae2254e..2895fdc22b 100644 --- a/epan/dissectors/packet-oer.h +++ b/epan/dissectors/packet-oer.h @@ -97,7 +97,7 @@ WS_DLL_PUBLIC guint32 dissect_oer_octet_string(tvbuff_t *tvb, guint32 offset, as //WS_DLL_PUBLIC guint32 dissect_oer_octet_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb); WS_DLL_PUBLIC guint32 -dissect_oer_bit_string(tvbuff_t *tvb, guint32 offset _U_, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_, int min_len _U_, int max_len _U_, gboolean has_extension _U_, const int **named_bits _U_, gint num_named_bits _U_, tvbuff_t **value_tvb _U_, int *len _U_); +dissect_oer_bit_string(tvbuff_t *tvb, guint32 offset _U_, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_, int min_len _U_, int max_len _U_, gboolean has_extension _U_, int * const *named_bits _U_, gint num_named_bits _U_, tvbuff_t **value_tvb _U_, int *len _U_); //WS_DLL_PUBLIC guint32 dissect_oer_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb); //WS_DLL_PUBLIC guint32 dissect_oer_restricted_character_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, const char *alphabet, int alphabet_length, tvbuff_t **value_tvb); diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c index d4a3c88f1b..579bb8f229 100644 --- a/epan/dissectors/packet-omron-fins.c +++ b/epan/dissectors/packet-omron-fins.c @@ -965,7 +965,7 @@ static const value_string omron_cyclic_trans_codes[] = { { 0x01, "Transmission" }, { 0, NULL } }; -static const int *omron_icf_fields[] = { +static int * const omron_icf_fields[] = { &hf_omron_icf_gwb, &hf_omron_icf_dtb, &hf_omron_icf_rb0, @@ -977,7 +977,7 @@ static const int *omron_icf_fields[] = { NULL }; -static const int *pc_status_fields[] = { +static int * const pc_status_fields[] = { &hf_omron_pc_status_pdc, &hf_omron_pc_status_hi, &hf_omron_pc_status_r1, @@ -986,7 +986,7 @@ static const int *pc_status_fields[] = { NULL }; -static const int *fatal_error_fields[] = { +static int * const fatal_error_fields[] = { &hf_omron_fatal_fals_error, &hf_omron_fatal_sfc_error, &hf_omron_fatal_cycle_time_over, @@ -1006,7 +1006,7 @@ static const int *fatal_error_fields[] = { NULL }; -static const int *non_fatal_error_fields[] = { +static int * const non_fatal_error_fields[] = { &hf_omron_non_fatal_rv1, &hf_omron_non_fatal_rv2, &hf_omron_non_fatal_power_interruption, @@ -1026,7 +1026,7 @@ static const int *non_fatal_error_fields[] = { NULL }; -static const int *message_fields[] = { +static int * const message_fields[] = { &hf_omron_message_no_0, &hf_omron_message_no_1, &hf_omron_message_no_2, @@ -1046,7 +1046,7 @@ static const int *message_fields[] = { NULL }; -static const int *message_yes_no_fields[] = { +static int * const message_yes_no_fields[] = { &hf_omron_message_rv_1, &hf_omron_message_rv_2, &hf_omron_message_rv_3, @@ -1057,7 +1057,7 @@ static const int *message_yes_no_fields[] = { NULL }; -static const int *data_type_fields[] = { +static int * const data_type_fields[] = { &hf_omron_data_type_type, &hf_omron_data_type_rv, &hf_omron_data_type_protected, @@ -1065,7 +1065,7 @@ static const int *data_type_fields[] = { NULL }; -static const int *cyclic_non_fatal_1_fields[] = { +static int * const cyclic_non_fatal_1_fields[] = { &hf_omron_cyclic_1, &hf_omron_cyclic_2, &hf_omron_cyclic_3, @@ -1076,7 +1076,7 @@ static const int *cyclic_non_fatal_1_fields[] = { NULL }; -static const int *cyclic_non_fatal_2_fields[] = { +static int * const cyclic_non_fatal_2_fields[] = { &hf_omron_cyclic_8, &hf_omron_cyclic_9, &hf_omron_cyclic_10, @@ -1088,7 +1088,7 @@ static const int *cyclic_non_fatal_2_fields[] = { NULL }; -static const int *cyclic_non_fatal_3_fields[] = { +static int * const cyclic_non_fatal_3_fields[] = { &hf_omron_cyclic_16, &hf_omron_cyclic_17, &hf_omron_cyclic_18, @@ -1100,7 +1100,7 @@ static const int *cyclic_non_fatal_3_fields[] = { NULL }; -static const int *cyclic_non_fatal_4_fields[] = { +static int * const cyclic_non_fatal_4_fields[] = { &hf_omron_cyclic_24, &hf_omron_cyclic_25, &hf_omron_cyclic_26, @@ -1112,7 +1112,7 @@ static const int *cyclic_non_fatal_4_fields[] = { NULL }; -static const int *cyclic_non_fatal_5_fields[] = { +static int * const cyclic_non_fatal_5_fields[] = { &hf_omron_cyclic_32, &hf_omron_cyclic_33, &hf_omron_cyclic_34, @@ -1124,7 +1124,7 @@ static const int *cyclic_non_fatal_5_fields[] = { NULL }; -static const int *cyclic_non_fatal_6_fields[] = { +static int * const cyclic_non_fatal_6_fields[] = { &hf_omron_cyclic_40, &hf_omron_cyclic_41, &hf_omron_cyclic_42, @@ -1136,7 +1136,7 @@ static const int *cyclic_non_fatal_6_fields[] = { NULL }; -static const int *cyclic_non_fatal_7_fields[] = { +static int * const cyclic_non_fatal_7_fields[] = { &hf_omron_cyclic_48, &hf_omron_cyclic_49, &hf_omron_cyclic_50, @@ -1148,7 +1148,7 @@ static const int *cyclic_non_fatal_7_fields[] = { NULL }; -static const int *cyclic_non_fatal_8_fields[] = { +static int * const cyclic_non_fatal_8_fields[] = { &hf_omron_cyclic_56, &hf_omron_cyclic_57, &hf_omron_cyclic_58, diff --git a/epan/dissectors/packet-opa-mad.c b/epan/dissectors/packet-opa-mad.c index d6d5e33324..78eb38b491 100644 --- a/epan/dissectors/packet-opa-mad.c +++ b/epan/dissectors/packet-opa-mad.c @@ -1013,7 +1013,7 @@ static gint hf_opa_mad_status_NM_reserved1 = -1; static gint hf_opa_mad_status_NM_InvalidField = -1; static gint hf_opa_mad_status_NM_RedirectRqrd = -1; static gint hf_opa_mad_status_NM_Busy = -1; -static const gint *_mad_status[] = { +static int * const _mad_status[] = { &hf_opa_mad_status_NM_ClassSpecific, &hf_opa_mad_status_NM_reserved1, &hf_opa_mad_status_NM_InvalidField, @@ -1047,32 +1047,32 @@ static gint hf_opa_attribute_modifier_P3 = -1; static gint hf_opa_attribute_modifier_S = -1; static gint hf_opa_attribute_modifier_S2 = -1; static gint hf_opa_attribute_modifier_Y = -1; -static const gint *_attribute_modifier_Nps2AP[] = { +static int * const _attribute_modifier_Nps2AP[] = { &hf_opa_attribute_modifier_NP, &hf_opa_attribute_modifier_S2, &hf_opa_attribute_modifier_A, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NpS2P[] = { +static int * const _attribute_modifier_NpS2P[] = { &hf_opa_attribute_modifier_NP, &hf_opa_attribute_modifier_S2, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NpAP[] = { +static int * const _attribute_modifier_NpAP[] = { &hf_opa_attribute_modifier_NP, &hf_opa_attribute_modifier_A, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NbP2B[] = { +static int * const _attribute_modifier_NbP2B[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_P2, &hf_opa_attribute_modifier_B, NULL }; -static const gint *_attribute_modifier_NbA2B2IE[] = { +static int * const _attribute_modifier_NbA2B2IE[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_A2, &hf_opa_attribute_modifier_B2, @@ -1080,50 +1080,50 @@ static const gint *_attribute_modifier_NbA2B2IE[] = { &hf_opa_attribute_modifier_E, NULL }; -static const gint *_attribute_modifier_NpSAP[] = { +static int * const _attribute_modifier_NpSAP[] = { &hf_opa_attribute_modifier_NP, &hf_opa_attribute_modifier_S, &hf_opa_attribute_modifier_A, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NbA3B3[] = { +static int * const _attribute_modifier_NbA3B3[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_A3, &hf_opa_attribute_modifier_B3, NULL }; -static const gint *_attribute_modifier_NbP3A4B4[] = { +static int * const _attribute_modifier_NbP3A4B4[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_P3, &hf_opa_attribute_modifier_A4, &hf_opa_attribute_modifier_B4, NULL }; -static const gint *_attribute_modifier_A5LP[] = { +static int * const _attribute_modifier_A5LP[] = { &hf_opa_attribute_modifier_A5, &hf_opa_attribute_modifier_L, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NbYAP[] = { +static int * const _attribute_modifier_NbYAP[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_Y, &hf_opa_attribute_modifier_A, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NpP[] = { +static int * const _attribute_modifier_NpP[] = { &hf_opa_attribute_modifier_NP, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NbP[] = { +static int * const _attribute_modifier_NbP[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_P, NULL }; -static const gint *_attribute_modifier_NbP3A6B5[] = { +static int * const _attribute_modifier_NbP3A6B5[] = { &hf_opa_attribute_modifier_NB, &hf_opa_attribute_modifier_P3, &hf_opa_attribute_modifier_A6, @@ -1221,7 +1221,7 @@ static gint hf_opa_Trap_DataValid_QP2 = -1; static gint hf_opa_Trap_DataValid_Gid1 = -1; static gint hf_opa_Trap_DataValid_Gid2 = -1; static gint hf_opa_Trap_DataValid_Reserved = -1; -static const gint *_Trap_DataValid[] = { +static int * const _Trap_DataValid[] = { &hf_opa_Trap_DataValid_Lid1, &hf_opa_Trap_DataValid_Lid2, &hf_opa_Trap_DataValid_PKey, @@ -1321,7 +1321,7 @@ static gint hf_opa_SwitchInfo_AdaptiveRoutingFrequency = -1; static gint hf_opa_SwitchInfo_AdaptiveRoutingLostRoutesOnly = -1; static gint hf_opa_SwitchInfo_AdaptiveRoutingThreshold = -1; static gint hf_opa_SwitchInfo_reserved6 = -1; -static const gint *_SwitchInfo_AdaptiveRouting[] = { +static int * const _SwitchInfo_AdaptiveRouting[] = { &hf_opa_SwitchInfo_AdaptiveRoutingEnable, &hf_opa_SwitchInfo_AdaptiveRoutingPause, &hf_opa_SwitchInfo_AdaptiveRoutingAlgorithm, @@ -1336,7 +1336,7 @@ static gint hf_opa_SwitchInfo_SwitchCapabilityMask_reserved = -1; static gint hf_opa_SwitchInfo_SwitchCapabilityMask_IsAddrRangeConfigSupported = -1; static gint hf_opa_SwitchInfo_SwitchCapabilityMask_reserved2 = -1; static gint hf_opa_SwitchInfo_SwitchCapabilityMask_IsAdaptiveRoutingSupported = -1; -static const gint *_SwitchInfo_SwitchCapabilityMask[] = { +static int * const _SwitchInfo_SwitchCapabilityMask[] = { &hf_opa_SwitchInfo_SwitchCapabilityMask_reserved, &hf_opa_SwitchInfo_SwitchCapabilityMask_IsAddrRangeConfigSupported, &hf_opa_SwitchInfo_SwitchCapabilityMask_reserved2, @@ -1411,7 +1411,7 @@ static gint hf_opa_PortInfo_PortMode_IsVLMarkerEnabled = -1; static gint hf_opa_PortInfo_PortMode_reserved2 = -1; static gint hf_opa_PortInfo_PortMode_Is16BTrapQueryEnabled = -1; static gint hf_opa_PortInfo_PortMode_reserved3 = -1; -static const gint *_PortInfo_PortMode[] = { +static int * const _PortInfo_PortMode[] = { &hf_opa_PortInfo_PortMode_reserved, &hf_opa_PortInfo_PortMode_IsActiveOptimizeEnabled, &hf_opa_PortInfo_PortMode_IsPassThroughEnabled, @@ -1460,7 +1460,7 @@ static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPktLenTooShort = -1; static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPktLenTooLong = -1; static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadPktLen = -1; static gint hf_opa_PortInfo_PortErrorAction_reserved4 = -1; -static const gint *_PortInfo_PortErrorAction[] = { +static int * const _PortInfo_PortErrorAction[] = { &hf_opa_PortInfo_PortErrorAction_ExcessiveBufferOverrun, &hf_opa_PortInfo_PortErrorAction_reserved, &hf_opa_PortInfo_PortErrorAction_FmConfigErrorExceedMulticastLimit, @@ -1520,7 +1520,7 @@ static gint hf_opa_PortInfo_CapabilityMask_IsAutomaticMigrationSupported = -1; static gint hf_opa_PortInfo_CapabilityMask_reserved5 = -1; static gint hf_opa_PortInfo_CapabilityMask_IsSM = -1; static gint hf_opa_PortInfo_CapabilityMask_reserved6 = -1; -static const gint *_PortInfo_CapabilityMask[] = { +static int * const _PortInfo_CapabilityMask[] = { &hf_opa_PortInfo_CapabilityMask_reserved, &hf_opa_PortInfo_CapabilityMask_IsCapabilityMaskNoticeSupported, &hf_opa_PortInfo_CapabilityMask_reserved2, @@ -1545,7 +1545,7 @@ static gint hf_opa_PortInfo_CapabilityMask3_IsSharedSpaceSupported = -1; static gint hf_opa_PortInfo_CapabilityMask3_reserved2 = -1; static gint hf_opa_PortInfo_CapabilityMask3_IsVLMarkerSupported = -1; static gint hf_opa_PortInfo_CapabilityMask3_IsVLrSupported = -1; -static const gint *_PortInfo_CapabilityMask3[] = { +static int * const _PortInfo_CapabilityMask3[] = { &hf_opa_PortInfo_CapabilityMask3_reserved, &hf_opa_PortInfo_CapabilityMask3_IsSnoopSupported, &hf_opa_PortInfo_CapabilityMask3_IsAsyncSCtoVLSupported, @@ -1580,7 +1580,7 @@ static gint hf_opa_PortStates_PortUnsleepState = -1; static gint hf_opa_PortStates_DownDefaultState = -1; static gint hf_opa_PortStates_PortPhysicalState = -1; static gint hf_opa_PortStates_PortState = -1; -static const gint *_PortStates[] = { +static int * const _PortStates[] = { &hf_opa_PortStates_reserved, &hf_opa_PortStates_LEDEnabled, &hf_opa_PortStates_IsSMConfigurationStarted, @@ -1941,7 +1941,7 @@ static gint hf_opa_ClearPortStatus_LinkDowned = -1; static gint hf_opa_ClearPortStatus_UncorrectableErrors = -1; static gint hf_opa_ClearPortStatus_reserved = -1; static gint hf_opa_ClearPortStatus_CounterSelectMask = -1; -static const gint *_ClearPortStatus_CounterSelectMask[] = { +static int * const _ClearPortStatus_CounterSelectMask[] = { &hf_opa_ClearPortStatus_PortXmitData, &hf_opa_ClearPortStatus_PortRcvData, &hf_opa_ClearPortStatus_PortXmitPkts, @@ -2037,7 +2037,7 @@ static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvSwitchRelayErrorInfo static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_UncorrectableErrorInfo = -1; static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_FMConfigErrorInfo = -1; static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_reserved = -1; -static const gint *_ErrorPortInfo_ErrorInfoSelectMask[] = { +static int * const _ErrorPortInfo_ErrorInfoSelectMask[] = { &hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvErrorInfo, &hf_opa_ErrorPortInfo_ErrorInfoSelectMask_ExcessiveBufferOverrunInfo, &hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortXmitConstraintErrorInfo, @@ -2195,7 +2195,7 @@ static gint hf_opa_ClearPortCounters_LinkDowned = -1; static gint hf_opa_ClearPortCounters_UncorrectableErrors = -1; static gint hf_opa_ClearPortCounters_reserved = -1; static gint hf_opa_ClearPortCounters_CounterSelectMask = -1; -static const gint *_ClearPortCounters_CounterSelectMask[] = { +static int * const _ClearPortCounters_CounterSelectMask[] = { &hf_opa_ClearPortCounters_PortXmitData, &hf_opa_ClearPortCounters_PortRcvData, &hf_opa_ClearPortCounters_PortXmitPkts, @@ -2256,7 +2256,7 @@ static gint hf_opa_ClearAllPortCounters_LinkDowned = -1; static gint hf_opa_ClearAllPortCounters_UncorrectableErrors = -1; static gint hf_opa_ClearAllPortCounters_reserved = -1; static gint hf_opa_ClearAllPortCounters_CounterSelectMask = -1; -static const gint *_ClearAllPortCounters_CounterSelectMask[] = { +static int * const _ClearAllPortCounters_CounterSelectMask[] = { &hf_opa_ClearAllPortCounters_PortXmitData, &hf_opa_ClearAllPortCounters_PortRcvData, &hf_opa_ClearAllPortCounters_PortXmitPkts, @@ -2440,7 +2440,7 @@ static gint hf_opa_ClearVFPortCounters_PortVFRcvBubble = -1; static gint hf_opa_ClearVFPortCounters_PortVFMarkFECN = -1; static gint hf_opa_ClearVFPortCounters_reserved = -1; static gint hf_opa_ClearVFPortCounters_CounterSelectMask = -1; -static const gint *_ClearVFPortCounters_CounterSelectMask[] = { +static int * const _ClearVFPortCounters_CounterSelectMask[] = { &hf_opa_ClearVFPortCounters_PortVFXmitData, &hf_opa_ClearVFPortCounters_PortVFRcvData, &hf_opa_ClearVFPortCounters_PortVFXmitPkts, diff --git a/epan/dissectors/packet-opa-snc.c b/epan/dissectors/packet-opa-snc.c index 8d2996b156..abc5b57673 100644 --- a/epan/dissectors/packet-opa-snc.c +++ b/epan/dissectors/packet-opa-snc.c @@ -85,12 +85,12 @@ static gint hf_opa_snc_pbc_pbcfecn = -1; static gint hf_opa_snc_pbc_reserved_21_16 = -1; static gint hf_opa_snc_pbc_pbcvl = -1; static gint hf_opa_snc_pbc_pbclengthdws = -1; -static const gint *_snc_pbc_1[] = { +static int * const _snc_pbc_1[] = { &hf_opa_snc_pbc_reserved_63_48, &hf_opa_snc_pbc_pbcstaticratecontrolcnt, NULL }; -static const gint *_snc_pbc_2[] = { +static int * const _snc_pbc_2[] = { &hf_opa_snc_pbc_pbcintr, &hf_opa_snc_pbc_pbcdcinfo, &hf_opa_snc_pbc_pbctestebp, @@ -122,7 +122,7 @@ static gint hf_opa_snc_rhf_egrindex = -1; static gint hf_opa_snc_rhf_useegrbfr = -1; static gint hf_opa_snc_rhf_rcvtype = -1; static gint hf_opa_snc_rhf_pktlen = -1; -static const gint *_snc_rhf_1[] = { +static int * const _snc_rhf_1[] = { &hf_opa_snc_rhf_icrcerr, &hf_opa_snc_rhf_reserved_62, &hf_opa_snc_rhf_eccerr, @@ -136,7 +136,7 @@ static const gint *_snc_rhf_1[] = { &hf_opa_snc_rhf_egroffset, NULL }; -static const gint *_snc_rhf_2[] = { +static int * const _snc_rhf_2[] = { &hf_opa_snc_rhf_rcvseq, &hf_opa_snc_rhf_dcinfo, &hf_opa_snc_rhf_egrindex, diff --git a/epan/dissectors/packet-opa.c b/epan/dissectors/packet-opa.c index 2494122c35..00138327d5 100644 --- a/epan/dissectors/packet-opa.c +++ b/epan/dissectors/packet-opa.c @@ -482,7 +482,7 @@ static gint hf_opa_KDETH_tidctrl = -1; static gint hf_opa_KDETH_tid = -1; static gint hf_opa_KDETH_offset_mode = -1; static gint hf_opa_KDETH_offset = -1; -static const gint *_opa_KDETH_word1[] = { +static int * const _opa_KDETH_word1[] = { &hf_opa_KDETH_kver, &hf_opa_KDETH_sh, &hf_opa_KDETH_intr, @@ -494,7 +494,7 @@ static const gint *_opa_KDETH_word1[] = { }; static gint hf_opa_KDETH_hcrc = -1; static gint hf_opa_KDETH_j_key = -1; -static const gint *_opa_KDETH_word2[] = { +static int * const _opa_KDETH_word2[] = { &hf_opa_KDETH_hcrc, &hf_opa_KDETH_j_key, NULL diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index ae1f86d934..d7d10960f9 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1100,7 +1100,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb, packet_info *pinfo, proto tvbuff_t *new_tvb = NULL; fragment_head *frag_msg = NULL; - static const int * ssdo_sacmd_flags[] = { + static int * const ssdo_sacmd_flags[] = { &hf_oss_ssdo_sacmd_end_segment, &hf_oss_ssdo_sacmd_initiate, &hf_oss_ssdo_sacmd_toggle, diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c index a91fa1edca..9a184dc9de 100644 --- a/epan/dissectors/packet-ositp.c +++ b/epan/dissectors/packet-ositp.c @@ -1480,7 +1480,7 @@ static int ositp_decode_CR_CC(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu, tvbuff_t *next_tvb; guint tpdu_len; heur_dtbl_entry_t *hdtbl_entry; - static const int * class_options[] = { + static int * const class_options[] = { &hf_cotp_class, &hf_cotp_opts_extended_formats, &hf_cotp_opts_no_explicit_flow_control, diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 797b168174..358b5cf979 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1034,36 +1034,36 @@ static gint ospf_v3_ls_type_to_filter (guint16 ls_type) return -1; } -static const int *bf_dbd[] = { +static int * const bf_dbd[] = { &hf_ospf_dbd_r, &hf_ospf_dbd_i, &hf_ospf_dbd_m, &hf_ospf_dbd_ms, NULL }; -static const int *bf_lls_ext_options[] = { +static int * const bf_lls_ext_options[] = { &hf_ospf_lls_ext_options_rs, &hf_ospf_lls_ext_options_lr, NULL }; -static const int *bf_v3_lls_ext_options[] = { +static int * const bf_v3_lls_ext_options[] = { &hf_ospf_v3_lls_ext_options_lr, &hf_ospf_v3_lls_ext_options_rs, NULL }; -static const int *bf_v3_lls_state_options[] = { +static int * const bf_v3_lls_state_options[] = { &hf_ospf_v3_lls_state_options_r, &hf_ospf_v3_lls_state_options_a, &hf_ospf_v3_lls_state_options_n, NULL }; -static const int *bf_v3_lls_relay_options[] = { +static int * const bf_v3_lls_relay_options[] = { &hf_ospf_v3_lls_relay_options_a, &hf_ospf_v3_lls_relay_options_n, NULL }; -static const int *bf_v2_router_lsa_flags[] = { +static int * const bf_v2_router_lsa_flags[] = { &hf_ospf_v2_router_lsa_flag_h, &hf_ospf_v2_router_lsa_flag_n, &hf_ospf_v2_router_lsa_flag_w, @@ -1072,20 +1072,20 @@ static const int *bf_v2_router_lsa_flags[] = { &hf_ospf_v2_router_lsa_flag_b, NULL }; -static const int *bf_v3_router_lsa_flags[] = { +static int * const bf_v3_router_lsa_flags[] = { &hf_ospf_v3_router_lsa_flag_w, &hf_ospf_v3_router_lsa_flag_v, &hf_ospf_v3_router_lsa_flag_e, &hf_ospf_v3_router_lsa_flag_b, NULL }; -static const int *bf_v3_as_external_flags[] = { +static int * const bf_v3_as_external_flags[] = { &hf_ospf_v3_as_external_flag_e, &hf_ospf_v3_as_external_flag_f, &hf_ospf_v3_as_external_flag_t, NULL }; -static const int *bf_v2_options[] = { +static int * const bf_v2_options[] = { &hf_ospf_v2_options_dn, &hf_ospf_v2_options_o, &hf_ospf_v2_options_dc, @@ -1096,7 +1096,7 @@ static const int *bf_v2_options[] = { &hf_ospf_v2_options_mt, NULL }; -static const int *bf_v2_options_lsa7[] = { +static int * const bf_v2_options_lsa7[] = { &hf_ospf_v2_options_dn, &hf_ospf_v2_options_o, &hf_ospf_v2_options_dc, @@ -1108,7 +1108,7 @@ static const int *bf_v2_options_lsa7[] = { NULL }; /* Structures for handling the bitfield of the Options field of Optional Router Capabilites LSA (RFC4970). */ -static const int *bf_ri_options[] = { +static int * const bf_ri_options[] = { &hf_ospf_ri_options_grc, &hf_ospf_ri_options_grh, &hf_ospf_ri_options_srs, @@ -1118,7 +1118,7 @@ static const int *bf_ri_options[] = { &hf_ospf_ri_options_host, NULL }; -static const int *bf_v3_options[] = { +static int * const bf_v3_options[] = { &hf_ospf_v3_options_at, &hf_ospf_v3_options_l, &hf_ospf_v3_options_af, @@ -1130,25 +1130,25 @@ static const int *bf_v3_options[] = { &hf_ospf_v3_options_v6, NULL }; -static const int *bf_v3_prefix_options[] = { +static int * const bf_v3_prefix_options[] = { &hf_ospf_v3_prefix_option_p, &hf_ospf_v3_prefix_option_mc, &hf_ospf_v3_prefix_option_la, &hf_ospf_v3_prefix_option_nu, NULL }; -static const int *bf_ospf_epfx_flags[] = { +static int * const bf_ospf_epfx_flags[] = { &hf_ospf_ls_epfx_flag_a, &hf_ospf_ls_epfx_flag_n, &hf_ospf_ls_epfx_flag_unknown, NULL }; -static const int *bf_ospf_epfx_range_flags[] = { +static int * const bf_ospf_epfx_range_flags[] = { &hf_ospf_ls_epfx_range_flag_ia, &hf_ospf_ls_epfx_range_flag_unknown, NULL }; -static const int *bf_ospf_pfxsid_flags[] = { +static int * const bf_ospf_pfxsid_flags[] = { &hf_ospf_ls_pfxsid_flag_np, &hf_ospf_ls_pfxsid_flag_m, &hf_ospf_ls_pfxsid_flag_e, @@ -1157,7 +1157,7 @@ static const int *bf_ospf_pfxsid_flags[] = { &hf_ospf_ls_pfxsid_flag_unknown, NULL }; -static const int *bf_ospf_adjsid_flags[] = { +static int * const bf_ospf_adjsid_flags[] = { &hf_ospf_ls_adjsid_flag_b, &hf_ospf_ls_adjsid_flag_v, &hf_ospf_ls_adjsid_flag_l, diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 1bdb0d5659..c79819abc2 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -2371,7 +2371,7 @@ dissect_p1_MTAOriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } -static const int * BuiltInEncodedInformationTypes_bits[] = { +static int * const BuiltInEncodedInformationTypes_bits[] = { &hf_p1_BuiltInEncodedInformationTypes_unknown, &hf_p1_BuiltInEncodedInformationTypes_telex, &hf_p1_BuiltInEncodedInformationTypes_ia5_text, @@ -2395,7 +2395,7 @@ dissect_p1_BuiltInEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t *t } -static const int * G3FacsimileNonBasicParameters_bits[] = { +static int * const G3FacsimileNonBasicParameters_bits[] = { &hf_p1_G3FacsimileNonBasicParameters_spare_bit0, &hf_p1_G3FacsimileNonBasicParameters_spare_bit1, &hf_p1_G3FacsimileNonBasicParameters_spare_bit2, @@ -2732,7 +2732,7 @@ dissect_p1_Priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ } -static const int * PerMessageIndicators_U_bits[] = { +static int * const PerMessageIndicators_U_bits[] = { &hf_p1_PerMessageIndicators_U_disclosure_of_other_recipients, &hf_p1_PerMessageIndicators_U_implicit_conversion_prohibited, &hf_p1_PerMessageIndicators_U_alternate_recipient_allowed, @@ -2933,7 +2933,7 @@ dissect_p1_ConvertedEncodedInformationTypes(gboolean implicit_tag _U_, tvbuff_t } -static const int * OtherActions_bits[] = { +static int * const OtherActions_bits[] = { &hf_p1_OtherActions_redirected, &hf_p1_OtherActions_dl_operation, NULL @@ -3128,7 +3128,7 @@ dissect_p1_ExtensionType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const int * Criticality_bits[] = { +static int * const Criticality_bits[] = { &hf_p1_Criticality_for_submission, &hf_p1_Criticality_for_transfer, &hf_p1_Criticality_for_delivery, @@ -3225,7 +3225,7 @@ dissect_p1_OriginallySpecifiedRecipientNumber(gboolean implicit_tag _U_, tvbuff_ } -static const int * PerRecipientIndicators_bits[] = { +static int * const PerRecipientIndicators_bits[] = { &hf_p1_PerRecipientIndicators_responsibility, &hf_p1_PerRecipientIndicators_originating_MTA_report, &hf_p1_PerRecipientIndicators_originating_MTA_non_delivery_report, @@ -4160,7 +4160,7 @@ dissect_p1_RecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const int * OriginatorReportRequest_bits[] = { +static int * const OriginatorReportRequest_bits[] = { &hf_p1_OriginatorReportRequest_spare_bit0, &hf_p1_OriginatorReportRequest_spare_bit1, &hf_p1_OriginatorReportRequest_spare_bit2, @@ -4409,7 +4409,7 @@ dissect_p1_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } -static const int * Operations_bits[] = { +static int * const Operations_bits[] = { &hf_p1_Operations_probe_submission_or_report_delivery, &hf_p1_Operations_message_submission_or_message_delivery, NULL @@ -4501,7 +4501,7 @@ dissect_p1_SubmissionControlArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * WaitingMessages_bits[] = { +static int * const WaitingMessages_bits[] = { &hf_p1_WaitingMessages_long_content, &hf_p1_WaitingMessages_low_priority, &hf_p1_WaitingMessages_other_security_labels, @@ -4732,7 +4732,7 @@ dissect_p1_DeliveredOriginatorName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * DeliveryFlags_bits[] = { +static int * const DeliveryFlags_bits[] = { &hf_p1_DeliveryFlags_spare_bit0, &hf_p1_DeliveryFlags_implicit_conversion_prohibited, NULL @@ -5240,7 +5240,7 @@ dissect_p1_T_objects(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } -static const int * T_source_type_bits[] = { +static int * const T_source_type_bits[] = { &hf_p1_T_source_type_originated_by, &hf_p1_T_source_type_redirected_by, &hf_p1_T_source_type_dl_expanded_by, @@ -5432,7 +5432,7 @@ dissect_p1_RestrictedDelivery(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * T_standard_parameters_bits[] = { +static int * const T_standard_parameters_bits[] = { &hf_p1_T_standard_parameters_user_name, &hf_p1_T_standard_parameters_user_address, &hf_p1_T_standard_parameters_deliverable_class, @@ -5774,7 +5774,7 @@ dissect_p1_PhysicalForwardingAddressRequest(gboolean implicit_tag _U_, tvbuff_t } -static const int * PhysicalDeliveryModes_bits[] = { +static int * const PhysicalDeliveryModes_bits[] = { &hf_p1_PhysicalDeliveryModes_ordinary_mail, &hf_p1_PhysicalDeliveryModes_special_delivery, &hf_p1_PhysicalDeliveryModes_express_mail, diff --git a/epan/dissectors/packet-p22.c b/epan/dissectors/packet-p22.c index a939742aee..b47e746f59 100644 --- a/epan/dissectors/packet-p22.c +++ b/epan/dissectors/packet-p22.c @@ -986,7 +986,7 @@ dissect_p22_AuthorizingUsersField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * NotificationRequests_bits[] = { +static int * const NotificationRequests_bits[] = { &hf_p22_NotificationRequests_rn, &hf_p22_NotificationRequests_nrn, &hf_p22_NotificationRequests_ipm_return, @@ -3189,7 +3189,7 @@ dissect_p22_User_Identity_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * Access_Request_bits[] = { +static int * const Access_Request_bits[] = { &hf_p22_Access_Request_read, &hf_p22_Access_Request_insert, &hf_p22_Access_Request_replace, @@ -3801,7 +3801,7 @@ dissect_p22_RecipientCategory(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * RecipientSecurityRequest_bits[] = { +static int * const RecipientSecurityRequest_bits[] = { &hf_p22_RecipientSecurityRequest_content_non_repudiation, &hf_p22_RecipientSecurityRequest_content_proof, &hf_p22_RecipientSecurityRequest_ipn_non_repudiation, diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index b28c53bc3f..fc08122695 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -1605,7 +1605,7 @@ dissect_p7_INTEGER_1_ub_messages(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } -static const int * OverrideRestrictions_bits[] = { +static int * const OverrideRestrictions_bits[] = { &hf_p7_OverrideRestrictions_override_content_types_restriction, &hf_p7_OverrideRestrictions_override_EITs_restriction, &hf_p7_OverrideRestrictions_override_attribute_length_restriction, @@ -2331,7 +2331,7 @@ dissect_p7_MessageGroupRegistrations(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * T_registrations_bits[] = { +static int * const T_registrations_bits[] = { &hf_p7_T_registrations_auto_action_registrations, &hf_p7_T_registrations_list_attribute_defaults, &hf_p7_T_registrations_fetch_attribute_defaults, @@ -3384,7 +3384,7 @@ dissect_p7_ModifyErrorParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const int * T_entry_class_problem_bits[] = { +static int * const T_entry_class_problem_bits[] = { &hf_p7_T_entry_class_problem_unsupported_entry_class, &hf_p7_T_entry_class_problem_entry_class_not_subscribed, &hf_p7_T_entry_class_problem_inappropriate_entry_class, diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index 43ffb2f4e9..38aa114cba 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -295,7 +295,7 @@ dissect_p772_InformationObject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * Acp127NotificationType_bits[] = { +static int * const Acp127NotificationType_bits[] = { &hf_p772_Acp127NotificationType_acp127_nn, &hf_p772_Acp127NotificationType_acp127_pn, &hf_p772_Acp127NotificationType_acp127_tn, diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 316681cb21..a4882bedbf 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -283,7 +283,7 @@ static proto_item* dissect_pbb_tlvvalue(tvbuff_t *tvb, proto_tree *tlvTree, guin proto_tree *tlv_decoded_value_tree = NULL; proto_tree *tlv_decoded_value_item = NULL; - static const int *mprwillingness_values[] = { + static int * const mprwillingness_values[] = { &hf_packetbb_tlv_mprwillingness_flooding, &hf_packetbb_tlv_mprwillingness_routing, NULL @@ -364,7 +364,7 @@ static int dissect_pbb_tlvblock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t int tlvCount = 0; - static const int *flags[] = { + static int * const flags[] = { &hf_packetbb_tlv_flags_hastypext, &hf_packetbb_tlv_flags_hassingleindex, &hf_packetbb_tlv_flags_hasmultiindex, @@ -542,7 +542,7 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, packet_info *pinfo, proto_tre int i = 0; - static const int *flags[] = { + static int * const flags[] = { &hf_packetbb_addr_flags_hashead, &hf_packetbb_addr_flags_hasfulltail, &hf_packetbb_addr_flags_haszerotail, @@ -887,7 +887,7 @@ static int dissect_pbb_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre guint8 packet_flags = tvb_get_guint8(tvb, 0); - static const int *flags[] = { + static int * const flags[] = { &hf_packetbb_header_flags_phasseqnum, &hf_packetbb_header_flags_phastlv, NULL diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 62dd441343..fec7fca08e 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -152,7 +152,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree *pagp_tree = NULL; proto_item *pagp_item, *len_item; proto_tree *tlv_tree; - static const int * pagp_flags[] = { + static int * const pagp_flags[] = { &hf_pagp_flags_slow_hello, &hf_pagp_flags_auto_mode, &hf_pagp_flags_consistent_state, diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 36310a658e..e0053a4169 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -208,7 +208,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static void dissect_pana_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - static const int * flag_fields[] = { + static int * const flag_fields[] = { &hf_pana_flag_r, &hf_pana_flag_s, &hf_pana_flag_c, @@ -229,7 +229,7 @@ dissect_pana_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 f static void dissect_pana_avp_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 flags) { - static const int * flag_fields[] = { + static int * const flag_fields[] = { &hf_pana_avp_flag_v, NULL, }; diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 648a3539a5..0c37030c78 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -11334,7 +11334,7 @@ dissect_pcap_UTDOA_CELLDCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * AvailableSignatures_bits[] = { +static int * const AvailableSignatures_bits[] = { &hf_pcap_AvailableSignatures_signature15, &hf_pcap_AvailableSignatures_signature14, &hf_pcap_AvailableSignatures_signature13, @@ -11391,7 +11391,7 @@ dissect_pcap_PreambleScramblingCodeWordNumber(tvbuff_t *tvb _U_, int offset _U_, } -static const int * AvailableSubChannelNumbers_bits[] = { +static int * const AvailableSubChannelNumbers_bits[] = { &hf_pcap_AvailableSubChannelNumbers_subCh11, &hf_pcap_AvailableSubChannelNumbers_subCh10, &hf_pcap_AvailableSubChannelNumbers_subCh9, diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index f130099ae3..55e2d4be66 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -1381,7 +1381,7 @@ dissect_pcep_tlvs(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gint length, int i, j; int padding = 0; - static const int *tlv_stateful_pce_capability_flags[] = { + static int * const tlv_stateful_pce_capability_flags[] = { &hf_pcep_lsp_update_capability, &hf_pcep_include_db_version, &hf_pcep_lsp_instantiation_capability, @@ -1391,7 +1391,7 @@ dissect_pcep_tlvs(proto_tree *pcep_obj, tvbuff_t *tvb, int offset, gint length, NULL }; - static const int *tlv_sr_pce_capability_flags[] = { + static int * const tlv_sr_pce_capability_flags[] = { &hf_pcep_sr_pce_capability_flags_l, NULL }; @@ -1753,7 +1753,7 @@ dissect_subobj_sr(proto_tree *pcep_subobj_tree, packet_info *pinfo, tvbuff_t *tv guint32 label; guint8 tc, bos, ttl; - static const int *subobj_sr_flags[] = { + static int * const subobj_sr_flags[] = { &hf_pcep_subobj_sr_flags_m, &hf_pcep_subobj_sr_flags_c, &hf_pcep_subobj_sr_flags_s, @@ -1878,7 +1878,7 @@ dissect_subobj_unnumb_interfaceID(proto_tree *pcep_subobj_tree, packet_info *pin case PCEP_RECORD_ROUTE_OBJ: case PCEP_SRRO_OBJ: { - static const int * flags[] = { + static int * const flags[] = { &pcep_subobj_flags_lpa, &pcep_subobj_flags_lpu, NULL @@ -3479,7 +3479,7 @@ dissect_pcep_obj_tree(proto_tree *pcep_tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree *pcep_object_tree; proto_item *pcep_object_item; - static const int *pcep_hdr_obj_flags[] = { + static int * const pcep_hdr_obj_flags[] = { &hf_pcep_hdr_obj_flags_i, &hf_pcep_hdr_obj_flags_p, &hf_pcep_hdr_obj_flags_reserved, diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index 65d046e304..beb5a2fe17 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.c @@ -1694,7 +1694,7 @@ static int dissect_pcp_partial_features(tvbuff_t *tvb, packet_info *pinfo, proto guint16 feature_flags; const gchar *feature_flags_string; - static const int * pcp_feature_flags_header_fields[] = { + static int * const pcp_feature_flags_header_fields[] = { &hf_pcp_features_flags_labels, &hf_pcp_features_flags_bad_label, &hf_pcp_features_flags_cert_reqd, diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index b14db61abd..03cfcb73d8 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -2074,7 +2074,7 @@ DEBUG_ENTRY("dissect_per_sequence_eag"); */ -static tvbuff_t *dissect_per_bit_string_display(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, header_field_info *hfi, guint32 length, const int **named_bits, gint num_named_bits _U_) +static tvbuff_t *dissect_per_bit_string_display(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, header_field_info *hfi, guint32 length, int * const *named_bits, gint num_named_bits _U_) { tvbuff_t *out_tvb = NULL; guint32 pad_length=0; @@ -2135,12 +2135,12 @@ static tvbuff_t *dissect_per_bit_string_display(tvbuff_t *tvb, guint32 offset, a // Process 8 bits at a time instead of 64, each field masks a // single byte. - const int** section_named_bits = named_bits + bit_offset; + int* const * section_named_bits = named_bits + bit_offset; int* flags[9]; if (num_named_bits - bit_offset > 8) { memcpy(&flags[0], named_bits + bit_offset, 8 * sizeof(int*)); flags[8] = NULL; - section_named_bits = (const int** )flags; + section_named_bits = flags; } // TODO should non-zero pad bits be masked from the value? @@ -2156,7 +2156,7 @@ static tvbuff_t *dissect_per_bit_string_display(tvbuff_t *tvb, guint32 offset, a return out_tvb; } guint32 -dissect_per_bit_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, const int **named_bits, gint num_named_bits, tvbuff_t **value_tvb, int *len) +dissect_per_bit_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, int * const *named_bits, gint num_named_bits, tvbuff_t **value_tvb, int *len) { /*gint val_start, val_length;*/ guint32 length, fragmented_length = 0; diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index 4f75e9138c..a2278c1d73 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -99,7 +99,7 @@ WS_DLL_PUBLIC guint32 dissect_per_sequence_eag(tvbuff_t *tvb, guint32 offset, as WS_DLL_PUBLIC guint32 dissect_per_octet_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, tvbuff_t **value_tvb); WS_DLL_PUBLIC guint32 dissect_per_octet_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb); -WS_DLL_PUBLIC guint32 dissect_per_bit_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, const int **named_bits, gint num_named_bits, tvbuff_t **value_tvb, int *len); +WS_DLL_PUBLIC guint32 dissect_per_bit_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, int * const *named_bits, gint num_named_bits, tvbuff_t **value_tvb, int *len); WS_DLL_PUBLIC guint32 dissect_per_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension, dissector_t type_cb); diff --git a/epan/dissectors/packet-pfcp.c b/epan/dissectors/packet-pfcp.c index 3a677f7676..bff25cd6dc 100644 --- a/epan/dissectors/packet-pfcp.c +++ b/epan/dissectors/packet-pfcp.c @@ -1728,7 +1728,7 @@ static int decode_pfcp_c_tag(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * { guint64 flags_val; - static const int * pfcp_c_tag_flags[] = { + static int * const pfcp_c_tag_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_c_tag_flags_b2_vid, &hf_pfcp_c_tag_flags_b1_dei, @@ -1759,7 +1759,7 @@ static int decode_pfcp_s_tag(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * { guint64 flags_val; - static const int * pfcp_s_tag_flags[] = { + static int * const pfcp_s_tag_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_s_tag_flags_b2_vid, &hf_pfcp_s_tag_flags_b1_dei, @@ -1873,7 +1873,7 @@ dissect_pfcp_f_teid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i int offset = 0; guint64 fteid_flags_val; - static const int * pfcp_fteid_flags[] = { + static int * const pfcp_fteid_flags[] = { &hf_pfcp_fteid_flg_spare, &hf_pfcp_fteid_flg_b3_ch_id, &hf_pfcp_fteid_flg_b2_ch, @@ -2004,7 +2004,7 @@ dissect_pfcp_sdf_filter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro guint32 fd_length; proto_tree *flow_desc_tree, *tos_tree, *spi_tree, *flow_label_tree, *sdf_filter_id_tree; - static const int * pfcp_sdf_filter_flags[] = { + static int * const pfcp_sdf_filter_flags[] = { &hf_pfcp_spare_h1, &hf_pfcp_sdf_filter_flags_b4_bid, &hf_pfcp_sdf_filter_flags_b3_fl, @@ -2116,7 +2116,7 @@ dissect_pfcp_gate_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr { int offset = 0; - static const int * pfcp_gate_status_flags[] = { + static int * const pfcp_gate_status_flags[] = { &hf_pfcp_gate_status_b3b2_ulgate, &hf_pfcp_gate_status_b0b1_dlgate, NULL @@ -2271,7 +2271,7 @@ dissect_pfcp_volume_threshold(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre int offset = 0; guint64 flags_val; - static const int * pfcp_volume_threshold_flags[] = { + static int * const pfcp_volume_threshold_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_volume_threshold_b2_dlvol, &hf_pfcp_volume_threshold_b1_ulvol, @@ -2367,7 +2367,7 @@ dissect_pfcp_subseq_volume_threshold(tvbuff_t *tvb, packet_info *pinfo, proto_tr int offset = 0; guint64 flags_val; - static const int * pfcp_subseq_volume_threshold_flags[] = { + static int * const pfcp_subseq_volume_threshold_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_subseq_volume_threshold_b2_dlvol, &hf_pfcp_subseq_volume_threshold_b1_ulvol, @@ -2454,7 +2454,7 @@ dissect_pfcp_reporting_triggers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { int offset = 0; - static const int * pfcp_reporting_triggers_o5_flags[] = { + static int * const pfcp_reporting_triggers_o5_flags[] = { &hf_pfcp_reporting_triggers_o5_b7_liusa, &hf_pfcp_reporting_triggers_o5_b6_droth, &hf_pfcp_reporting_triggers_o5_b5_stopt, @@ -2473,7 +2473,7 @@ dissect_pfcp_reporting_triggers(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t return; } - static const int * pfcp_reporting_triggers_o6_flags[] = { + static int * const pfcp_reporting_triggers_o6_flags[] = { &hf_pfcp_spare_b7, &hf_pfcp_reporting_triggers_o6_b6_ipmjl, &hf_pfcp_reporting_triggers_o6_b5_evequ, @@ -2560,7 +2560,7 @@ dissect_pfcp_report_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr { int offset = 0; - static const int * pfcp_report_type_flags[] = { + static int * const pfcp_report_type_flags[] = { &hf_pfcp_spare_b7, &hf_pfcp_report_type_b6_uisr, &hf_pfcp_report_type_b5_sesr, @@ -2663,7 +2663,7 @@ dissect_pfcp_up_function_features(tvbuff_t *tvb, packet_info *pinfo, proto_tree { int offset = 0; - static const int * pfcp_up_function_features_o5_flags[] = { + static int * const pfcp_up_function_features_o5_flags[] = { &hf_pfcp_up_function_features_o5_b7_treu, &hf_pfcp_up_function_features_o5_b6_heeu, &hf_pfcp_up_function_features_o5_b5_pfdm, @@ -2682,7 +2682,7 @@ dissect_pfcp_up_function_features(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } - static const int * pfcp_up_function_features_o6_flags[] = { + static int * const pfcp_up_function_features_o6_flags[] = { &hf_pfcp_up_function_features_o6_b7_epfar, &hf_pfcp_up_function_features_o6_b6_pfde, &hf_pfcp_up_function_features_o6_b5_frrt, @@ -2701,7 +2701,7 @@ dissect_pfcp_up_function_features(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } - static const int * pfcp_up_function_features_o7_flags[] = { + static int * const pfcp_up_function_features_o7_flags[] = { &hf_pfcp_up_function_features_o7_b7_gcom, &hf_pfcp_up_function_features_o7_b6_bundl, &hf_pfcp_up_function_features_o7_b5_mte_n4, @@ -2720,7 +2720,7 @@ dissect_pfcp_up_function_features(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } - static const int * pfcp_up_function_features_o8_flags[] = { + static int * const pfcp_up_function_features_o8_flags[] = { &hf_pfcp_up_function_features_o8_b7_mptcp, &hf_pfcp_up_function_features_o8_b6_tscu, &hf_pfcp_up_function_features_o8_b5_ip6pl, @@ -2739,7 +2739,7 @@ dissect_pfcp_up_function_features(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } - static const int * pfcp_up_function_features_o9_flags[] = { + static int * const pfcp_up_function_features_o9_flags[] = { &hf_pfcp_spare_b7_b6, &hf_pfcp_up_function_features_o9_b5_ethar, &hf_pfcp_up_function_features_o9_b4_ciot, @@ -2766,7 +2766,7 @@ dissect_pfcp_apply_action(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre { int offset = 0; - static const int * pfcp_apply_action_o5_flags[] = { + static int * const pfcp_apply_action_o5_flags[] = { &hf_pfcp_apply_action_flags_o5_b7_dfrt, &hf_pfcp_apply_action_flags_o5_b6_ipmd, &hf_pfcp_apply_action_flags_o5_b5_ipma, @@ -2785,7 +2785,7 @@ dissect_pfcp_apply_action(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre return; } - static const int * pfcp_apply_action_o6_flags[] = { + static int * const pfcp_apply_action_o6_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_apply_action_flags_o6_b0_edrt, NULL @@ -2808,7 +2808,7 @@ dissect_pfcp_dl_data_service_inf(tvbuff_t *tvb, packet_info *pinfo, proto_tree * int offset = 0; guint64 flags; - static const int * pfcp_dl_data_service_inf_flags[] = { + static int * const pfcp_dl_data_service_inf_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_dl_data_service_inf_b1_qfii, &hf_pfcp_dl_data_service_inf_b0_ppi, @@ -2947,7 +2947,7 @@ dissect_pfcp_pfcpsmreq_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { int offset = 0; - static const int * pfcp_pfcpsmreq_flags[] = { + static int * const pfcp_pfcpsmreq_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_pfcpsmreq_flags_b2_qaurr, &hf_pfcp_pfcpsmreq_flags_b1_sndem, @@ -2972,7 +2972,7 @@ dissect_pfcp_pfcpsrrsp_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { int offset = 0; - static const int * pfcp_pfcpsrrsp_flags[] = { + static int * const pfcp_pfcpsrrsp_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pfcpsrrsp_flags_b0_drobu, NULL @@ -3104,7 +3104,7 @@ dissect_pfcp_f_seid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i guint64 seid_cp, *seid; guint32 *session; - static const int * pfcp_f_seid_flags[] = { + static int * const pfcp_f_seid_flags[] = { &hf_pfcp_spare_b7, &hf_pfcp_spare_b6, &hf_pfcp_spare_b5, @@ -3269,7 +3269,7 @@ dissect_pfcp_pfd_contents(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p guint32 len; proto_tree *afd_tree, *aurl_tree, *adnp_tree; - static const int * pfcp_pfd_contents_flags[] = { + static int * const pfcp_pfd_contents_flags[] = { &hf_pfcp_pfd_contents_flags_b7_adnp, &hf_pfcp_pfd_contents_flags_b6_aurl, &hf_pfcp_pfd_contents_flags_b5_afd, @@ -3464,7 +3464,7 @@ dissect_pfcp_measurement_method(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { int offset = 0; - static const int * pfcp_measurement_method_flags[] = { + static int * const pfcp_measurement_method_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_measurement_method_flags_b2_event, &hf_pfcp_measurement_method_flags_b1_volume, @@ -3490,7 +3490,7 @@ dissect_pfcp_usage_report_trigger(tvbuff_t *tvb, packet_info *pinfo, proto_tree { int offset = 0; - static const int * pfcp_usage_report_trigger_o5_flags[] = { + static int * const pfcp_usage_report_trigger_o5_flags[] = { &hf_pfcp_usage_report_trigger_o5_b7_immer, &hf_pfcp_usage_report_trigger_o5_b6_droth, &hf_pfcp_usage_report_trigger_o5_b5_stopt, @@ -3509,7 +3509,7 @@ dissect_pfcp_usage_report_trigger(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } - static const int * pfcp_usage_report_trigger_o6_flags[] = { + static int * const pfcp_usage_report_trigger_o6_flags[] = { &hf_pfcp_usage_report_trigger_o6_b7_eveth, &hf_pfcp_usage_report_trigger_o6_b6_macar, &hf_pfcp_usage_report_trigger_o6_b5_envcl, @@ -3528,7 +3528,7 @@ dissect_pfcp_usage_report_trigger(tvbuff_t *tvb, packet_info *pinfo, proto_tree return; } - static const int * pfcp_usage_report_trigger_o7_flags[] = { + static int * const pfcp_usage_report_trigger_o7_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_usage_report_trigger_o7_b2_ipmjl, &hf_pfcp_usage_report_trigger_o7_b1_tebur, @@ -3635,7 +3635,7 @@ dissect_pfcp_volume_measurement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t int offset = 0; guint64 flags; - static const int * pfcp_volume_measurement_flags[] = { + static int * const pfcp_volume_measurement_flags[] = { &hf_pfcp_spare_b7_b6, &hf_pfcp_volume_measurement_b5_dlnop, &hf_pfcp_volume_measurement_b4_ulnop, @@ -3783,7 +3783,7 @@ dissect_pfcp_dropped_dl_traffic_threshold(tvbuff_t *tvb, packet_info *pinfo, pro int offset = 0; guint64 flags_val; - static const int * pfcp_dropped_dl_traffic_threshold_flags[] = { + static int * const pfcp_dropped_dl_traffic_threshold_flags[] = { &hf_pfcp_dropped_dl_traffic_threshold_b1_dlby, &hf_pfcp_dropped_dl_traffic_threshold_b0_dlpa, NULL @@ -3822,7 +3822,7 @@ dissect_pfcp_volume_quota(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p int offset = 0; guint64 flags_val; - static const int * pfcp_volume_quota_flags[] = { + static int * const pfcp_volume_quota_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_volume_quota_b2_dlvol, &hf_pfcp_volume_quota_b1_ulvol, @@ -4112,7 +4112,7 @@ dissect_pfcp_cp_function_features(tvbuff_t *tvb, packet_info *pinfo, proto_tree { int offset = 0; - static const int * pfcp_cp_function_features_flags[] = { + static int * const pfcp_cp_function_features_flags[] = { &hf_pfcp_spare_b7, &hf_pfcp_cp_function_features_b6_ardr, &hf_pfcp_cp_function_features_b5_mpas, @@ -4145,7 +4145,7 @@ dissect_pfcp_usage_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr { int offset = 0; - static const int * pfcp_usage_information_flags[] = { + static int * const pfcp_usage_information_flags[] = { &hf_pfcp_spare_h1, &hf_pfcp_usage_information_b3_ube, &hf_pfcp_usage_information_b2_uae, @@ -4238,7 +4238,7 @@ dissect_pfcp_ue_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = 0; guint64 ue_ip_address_flags; - static const int * pfcp_ue_ip_address_flags[] = { + static int * const pfcp_ue_ip_address_flags[] = { &hf_pfcp_spare_b7, &hf_pfcp_ue_ip_address_flag_b6_v6pl, &hf_pfcp_ue_ip_address_flag_b5_chv6, @@ -4298,7 +4298,7 @@ dissect_pfcp_packet_rate(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr int offset = 0; guint64 flags; - static const int * pfcp_packet_rate_flags[] = { + static int * const pfcp_packet_rate_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_packet_rate_b2_aprc, &hf_pfcp_packet_rate_b1_dlpr, @@ -4382,7 +4382,7 @@ dissect_pfcp_outer_hdr_rem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr int offset = 0; guint32 value; - static const int * pfcp_gtpu_ext_hdr_del_flags[] = { + static int * const pfcp_gtpu_ext_hdr_del_flags[] = { &hf_pfcp_gtpu_ext_hdr_del_b0_pdu_sess_cont, NULL }; @@ -4432,7 +4432,7 @@ dissect_pfcp_dl_flow_level_marking(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ int offset = 0; guint64 flags_val; - static const int * pfcp_dl_flow_level_marking_flags[] = { + static int * const pfcp_dl_flow_level_marking_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_dl_flow_level_marking_b1_sci, &hf_pfcp_dl_flow_level_marking_b0_ttc, @@ -4532,7 +4532,7 @@ dissect_pfcp_measurement_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre { int offset = 0; - static const int * pfcp_measurement_info_flags[] = { + static int * const pfcp_measurement_info_flags[] = { &hf_pfcp_spare_b7_b5, &hf_pfcp_measurement_info_b4_mnop, &hf_pfcp_measurement_info_b3_istm, @@ -4559,7 +4559,7 @@ dissect_pfcp_node_report_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre { int offset = 0; - static const int * pfcp_node_report_type_flags[] = { + static int * const pfcp_node_report_type_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_node_report_type_b3_gpqr, &hf_pfcp_node_report_type_b2_ckdr, @@ -4587,7 +4587,7 @@ dissect_pfcp_remote_gtp_u_peer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint64 flags; guint32 length_di, length_ni; - static const int * pfcp_remote_gtp_u_peer_flags[] = { + static int * const pfcp_remote_gtp_u_peer_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_remote_gtp_u_peer_flags_b3_ni, &hf_pfcp_remote_gtp_u_peer_flags_b2_di, @@ -4769,7 +4769,7 @@ dissect_pfcp_oci_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot { int offset = 0; - static const int * pfcp_oci_flags_flags[] = { + static int * const pfcp_oci_flags_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_oci_flags_b0_aoci, NULL @@ -4793,7 +4793,7 @@ dissect_pfcp_pfcp_assoc_rel_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { int offset = 0; - static const int * pfcp_pfcp_assoc_rel_req_flags[] = { + static int * const pfcp_pfcp_assoc_rel_req_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pfcp_assoc_rel_req_b0_sarr, NULL @@ -4986,7 +4986,7 @@ dissect_pfcp_user_plane_ip_resource_infomation(tvbuff_t *tvb, packet_info *pinfo guint64 upiri_flags_val; guint32 upiri_teid_range; - static const int * pfcp_upiri_flags[] = { + static int * const pfcp_upiri_flags[] = { &hf_pfcp_spare_b7_b6, &hf_pfcp_upiri_flg_b6_assosi, &hf_pfcp_upiri_flg_b5_assoni, @@ -5118,7 +5118,7 @@ dissect_pfcp_subsequent_volume_quota(tvbuff_t *tvb, packet_info *pinfo, proto_tr int offset = 0; guint64 flags_val; - static const int * pfcp_subsequent_volume_quota_flags[] = { + static int * const pfcp_subsequent_volume_quota_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_subsequent_volume_quota_b2_dlvol, &hf_pfcp_subsequent_volume_quota_b1_ulvol, @@ -5260,7 +5260,7 @@ dissect_pfcp_additional_usage_reports_information(tvbuff_t *tvb, packet_info *pi * Bit 7 of Octet 5 is the most significant bit and bit 1 of Octet 6 is the least significant bit. * The bit 8 of octet 5 shall encode the AURI (Additional Usage Reports Indication) flag{...}. */ - static const int * pfcp_additional_usage_reports_information_flags[] = { + static int * const pfcp_additional_usage_reports_information_flags[] = { &hf_pfcp_additional_usage_reports_information_b15_auri, &hf_pfcp_additional_usage_reports_information_b14_b0_number_value, NULL @@ -5298,7 +5298,7 @@ static void dissect_pfcp_mac_address(tvbuff_t *tvb, packet_info *pinfo, proto_tr int offset = 0; guint64 flags_val; - static const int * pfcp_mac_address_flags[] = { + static int * const pfcp_mac_address_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_mac_address_flags_b3_udes, &hf_pfcp_mac_address_flags_b2_usou, @@ -5405,7 +5405,7 @@ static void dissect_pfcp_proxying(tvbuff_t *tvb, packet_info *pinfo, proto_tree int offset = 0; guint64 flags_val; - static const int * pfcp_proxying_flags[] = { + static int * const pfcp_proxying_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_proxying_flags_b1_ins, &hf_pfcp_proxying_flags_b0_arp, @@ -5446,7 +5446,7 @@ static void dissect_pfcp_ethernet_filter_properties(tvbuff_t *tvb, packet_info * int offset = 0; guint64 flags_val; - static const int * pfcp_ethernet_filter_properties_flags[] = { + static int * const pfcp_ethernet_filter_properties_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_ethertype_filter_properties_flags_b0_bide, NULL @@ -5490,7 +5490,7 @@ static void dissect_pfcp_user_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree * guint64 flags_val; guint32 length_imsi, length_imei, length_msisdn, length_nai; - static const int * pfcp_user_id_flags[] = { + static int * const pfcp_user_id_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_user_id_flags_b3_naif, &hf_pfcp_user_id_flags_b2_msisdnf, @@ -5561,7 +5561,7 @@ static void dissect_pfcp_ethernet_pdu_session_information(tvbuff_t *tvb, packet_ { int offset = 0; - static const int * pfcp_ethernet_pdu_session_information_flags[] = { + static int * const pfcp_ethernet_pdu_session_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_ethernet_pdu_session_information_flags_b0_ethi, NULL @@ -6022,7 +6022,7 @@ dissect_pfcp_pfcpsrreq_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { int offset = 0; - static const int * pfcp_pfcpsrreq_flags[] = { + static int * const pfcp_pfcpsrreq_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pfcpsrreq_flags_b0_psdbu, NULL @@ -6046,7 +6046,7 @@ dissect_pfcp_pfcpaureq_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { int offset = 0; - static const int * pfcp_pfcpaureq_flags[] = { + static int * const pfcp_pfcpaureq_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pfcpaureq_flags_b0_parps, NULL @@ -6265,7 +6265,7 @@ dissect_pfcp_alternative_smf_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto int offset = 0; guint64 alternative_smf_ip_address_flags; - static const int * pfcp_alternative_smf_ip_address_flags[] = { + static int * const pfcp_alternative_smf_ip_address_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_b1_v4, &hf_pfcp_b0_v6, @@ -6302,7 +6302,7 @@ dissect_pfcp_packet_replication_and_detection_carry_on_information(tvbuff_t *tvb { int offset = 0; - static const int * pfcp_packet_replication_and_detection_carry_on_information_flags[] = { + static int * const pfcp_packet_replication_and_detection_carry_on_information_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b3_dcaroni, &hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b2_prin6i, @@ -6381,7 +6381,7 @@ dissect_pfcp_pfcpasrsp_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { int offset = 0; - static const int * pfcp_pfcpasrsp_flags_flags[] = { + static int * const pfcp_pfcpasrsp_flags_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pfcpasrsp_flags_flags_b0_psrei, NULL @@ -6405,7 +6405,7 @@ dissect_pfcp_cp_pfcp_entity_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto_ int offset = 0; guint64 cp_pfcp_entity_ip_address_flags; - static const int * pfcp_cp_pfcp_entity_ip_address_flags[] = { + static int * const pfcp_cp_pfcp_entity_ip_address_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_b1_v4, &hf_pfcp_b0_v6, @@ -6442,7 +6442,7 @@ dissect_pfcp_pfcpsereq_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree { int offset = 0; - static const int * pfcp_pfcpsereq_flags_flags[] = { + static int * const pfcp_pfcpsereq_flags_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pfcpsereq_flags_flags_b0_resti, NULL @@ -6466,7 +6466,7 @@ dissect_pfcp_ip_multicast_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree int offset = 0; guint64 ip_multicast_address_flags; - static const int * pfcp_ip_multicast_address_flags[] = { + static int * const pfcp_ip_multicast_address_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_ip_multicast_address_flags_b3_any, &hf_pfcp_ip_multicast_address_flags_b2_range, @@ -6520,7 +6520,7 @@ dissect_pfcp_source_ip_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr int offset = 0; guint64 source_ip_address_flags; - static const int * pfcp_source_ip_address_flags[] = { + static int * const pfcp_source_ip_address_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_source_ip_address_flags_b2_mpl, &hf_pfcp_b1_v4, @@ -6566,7 +6566,7 @@ dissect_pfcp_packet_rate_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t int offset = 0; guint64 flags_val; - static const int * pfcp_packet_rate_status_flags[] = { + static int * const pfcp_packet_rate_status_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_packet_rate_status_flags_b2_apr, &hf_pfcp_packet_rate_status_flags_b1_dl, @@ -6619,7 +6619,7 @@ dissect_pfcp_create_bridge_info_for_tsc(tvbuff_t *tvb, packet_info *pinfo, proto { int offset = 0; - static const int * pfcp_create_bridge_info_for_tsc_flags[] = { + static int * const pfcp_create_bridge_info_for_tsc_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_create_bridge_info_for_tsc_flags_b0_bii, NULL @@ -6669,7 +6669,7 @@ dissect_pfcp_tsn_bridge_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset = 0; guint64 flags_val; - static const int * pfcp_tsn_bridge_id_flags[] = { + static int * const pfcp_tsn_bridge_id_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_tsn_bridge_id_flags_b0_mac, NULL @@ -6709,7 +6709,7 @@ dissect_pfcp_requested_clock_drift_control_information(tvbuff_t *tvb, packet_inf { int offset = 0; - static const int * pfcp_requested_clock_drift_control_information_flags[] = { + static int * const pfcp_requested_clock_drift_control_information_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_requested_clock_drift_control_information_flags_b1_rrcr, &hf_pfcp_requested_clock_drift_control_information_flags_b0_rrto, @@ -6841,7 +6841,7 @@ dissect_pfcp_requested_access_availability_control_information(tvbuff_t *tvb, pa { int offset = 0; - static const int * pfcp_requested_access_availability_control_information_flags[] = { + static int * const pfcp_requested_access_availability_control_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_requested_access_availability_control_information_flags_b0_rrca, NULL @@ -6896,7 +6896,7 @@ dissect_pfcp_mptcp_control_information(tvbuff_t *tvb, packet_info *pinfo, proto_ { int offset = 0; - static const int * pfcp_mptcp_control_information_flags[] = { + static int * const pfcp_mptcp_control_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_mptcp_control_information_flags_b0_tci, NULL @@ -6919,7 +6919,7 @@ dissect_pfcp_atsss_ll_control_information(tvbuff_t *tvb, packet_info *pinfo, pro { int offset = 0; - static const int * pfcp_atsss_ll_control_information_flags[] = { + static int * const pfcp_atsss_ll_control_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_atsss_ll_control_information_flags_b0_lli, NULL @@ -6942,7 +6942,7 @@ dissect_pfcp_pmf_control_information(tvbuff_t *tvb, packet_info *pinfo, proto_tr { int offset = 0; - static const int * pfcp_pmf_control_information_flags[] = { + static int * const pfcp_pmf_control_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_pmf_control_information_flags_b0_pmfi, NULL @@ -6966,7 +6966,7 @@ dissect_pfcp_mptcp_address_information(tvbuff_t *tvb, packet_info *pinfo, proto_ int offset = 0; guint64 mptcp_address_flags; - static const int * pfcp_mptcp_ip_address_information_flags[] = { + static int * const pfcp_mptcp_ip_address_information_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_mptcp_address_information_flags_b1_v6, &hf_pfcp_mptcp_address_information_flags_b0_v4, @@ -7012,7 +7012,7 @@ dissect_pfcp_ue_link_specific_ip_address(tvbuff_t *tvb, packet_info *pinfo, prot int offset = 0; guint64 ue_link_specific_ip_address_flags; - static const int * pfcp_ue_link_specific_ip_address_flags[] = { + static int * const pfcp_ue_link_specific_ip_address_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_ue_link_specific_ip_address_flags_b3_nv6, &hf_pfcp_ue_link_specific_ip_address_flags_b2_nv4, @@ -7060,7 +7060,7 @@ dissect_pfcp_pmf_address_information(tvbuff_t *tvb, packet_info *pinfo, proto_tr int offset = 0; guint64 pmf_address_information_flags; - static const int * pfcp_pmf_address_information_flags[] = { + static int * const pfcp_pmf_address_information_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_pmf_address_information_flags_b2_mac, &hf_pfcp_pmf_address_information_flags_b1_v6, @@ -7115,7 +7115,7 @@ dissect_pfcp_atsss_ll_information(tvbuff_t *tvb, packet_info *pinfo, proto_tree { int offset = 0; - static const int * pfcp_atsss_ll_information_flags[] = { + static int * const pfcp_atsss_ll_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_atsss_ll_information_flags_b0_lli, NULL @@ -7203,7 +7203,7 @@ dissect_pfcp_qos_report_trigger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { int offset = 0; - static const int * pfcp_qos_report_trigger_flags[] = { + static int * const pfcp_qos_report_trigger_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_qos_report_trigger_flags_b2_ire, &hf_pfcp_qos_report_trigger_flags_b1_thr, @@ -7228,7 +7228,7 @@ dissect_pfcp_gtp_u_path_interface_type(tvbuff_t *tvb, packet_info *pinfo, proto_ { int offset = 0; - static const int * pfcp_gtp_u_path_interface_type_flags[] = { + static int * const pfcp_gtp_u_path_interface_type_flags[] = { &hf_pfcp_spare_b7_b2, &hf_pfcp_gtp_u_path_interface_type_flags_b1_n3, &hf_pfcp_gtp_u_path_interface_type_flags_b0_n9, @@ -7252,7 +7252,7 @@ dissect_pfcp_requested_qos_monitoring(tvbuff_t *tvb, packet_info *pinfo, proto_t { int offset = 0; - static const int * pfcp_requested_qos_monitoring_flags[] = { + static int * const pfcp_requested_qos_monitoring_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_requested_qos_monitoring_flags_b2_rp, &hf_pfcp_requested_qos_monitoring_flags_b1_ul, @@ -7277,7 +7277,7 @@ dissect_pfcp_reporting_frequency(tvbuff_t *tvb, packet_info *pinfo, proto_tree * { int offset = 0; - static const int * pfcp_reporting_frequency_flags[] = { + static int * const pfcp_reporting_frequency_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_reporting_frequency_flags_b2_sesrl, &hf_pfcp_reporting_frequency_flags_b1_perio, @@ -7303,7 +7303,7 @@ dissect_pfcp_packet_delay_thresholds(tvbuff_t *tvb, packet_info *pinfo, proto_tr int offset = 0; guint64 packet_delay_thresholds_flags; - static const int * pfcp_packet_delay_thresholds_flags[] = { + static int * const pfcp_packet_delay_thresholds_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_packet_delay_thresholds_flags_b2_rp, &hf_pfcp_packet_delay_thresholds_flags_b1_ul, @@ -7364,7 +7364,7 @@ dissect_pfcp_qos_monitoring_measurement(tvbuff_t *tvb, packet_info *pinfo, proto int offset = 0; guint64 qos_monitoring_measurement_flags; - static const int * pfcp_qos_monitoring_measurement_flags[] = { + static int * const pfcp_qos_monitoring_measurement_flags[] = { &hf_pfcp_spare_b7_b4, &hf_pfcp_qos_monitoring_measurement_flags_b3_plmf, &hf_pfcp_qos_monitoring_measurement_flags_b2_rp, @@ -7408,7 +7408,7 @@ dissect_pfcp_mt_edt_control_information(tvbuff_t *tvb, packet_info *pinfo, proto { int offset = 0; - static const int * pfcp_mt_edt_control_information_flags[] = { + static int * const pfcp_mt_edt_control_information_flags[] = { &hf_pfcp_spare_b7_b1, &hf_pfcp_mt_edt_control_information_flags_b0_rdsi, NULL @@ -7448,7 +7448,7 @@ dissect_pfcp_qer_control_indications(tvbuff_t *tvb, packet_info *pinfo, proto_tr { int offset = 0; - static const int * pfcp_qer_control_indications_o5_flags[] = { + static int * const pfcp_qer_control_indications_o5_flags[] = { &hf_pfcp_spare_b7_b3, &hf_pfcp_qer_control_indications_o5_b2_nord, &hf_pfcp_qer_control_indications_o5_b1_moed, @@ -8547,7 +8547,7 @@ dissect_pfcp_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pfcp_session_args_t *args = NULL; pfcp_hdr_t *pfcp_hdr = NULL; - static const int * pfcp_hdr_flags[] = { + static int * const pfcp_hdr_flags[] = { &hf_pfcp_version, &hf_pfcp_spare_b4, &hf_pfcp_spare_b3, diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 945060414a..b9570d0aeb 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -349,7 +349,7 @@ static gboolean use_main_tree = TRUE; * Protocol Specification", also describes a protocol that runs atop IP, * with a protocol number of 103, and with a PIM version number field of 2. */ -static const gint *pim_src_flags_fields[] = { +static int * const pim_src_flags_fields[] = { &hf_pim_src_flags_a, &hf_pim_src_flags_s, &hf_pim_src_flags_w, @@ -358,14 +358,14 @@ static const gint *pim_src_flags_fields[] = { NULL }; -static const int *pim_group_addr_flags[] = { +static int * const pim_group_addr_flags[] = { &hf_pim_group_addr_flags_b, &hf_pim_group_addr_flags_reserved, &hf_pim_group_addr_flags_z, NULL }; -static const int *pim_source_addr_flags[] = { +static int * const pim_source_addr_flags[] = { &hf_pim_source_addr_flags_reserved, &hf_pim_source_addr_flags_s, &hf_pim_source_addr_flags_w, @@ -373,7 +373,7 @@ static const int *pim_source_addr_flags[] = { NULL }; -static const int *pim_source_ja_flags[] = { +static int * const pim_source_ja_flags[] = { &hf_pim_source_ja_flags_f, &hf_pim_source_ja_flags_e, &hf_pim_source_ja_flags_attr_type, diff --git a/epan/dissectors/packet-pkixac.c b/epan/dissectors/packet-pkixac.c index d6da566e2d..a47a84fe37 100644 --- a/epan/dissectors/packet-pkixac.c +++ b/epan/dissectors/packet-pkixac.c @@ -357,7 +357,7 @@ dissect_pkixac_RoleSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const int * ClassList_bits[] = { +static int * const ClassList_bits[] = { &hf_pkixac_ClassList_unmarked, &hf_pkixac_ClassList_unclassified, &hf_pkixac_ClassList_restricted, diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 373627c319..e1a2125271 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -223,7 +223,7 @@ dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const int * PKIFailureInfo_bits[] = { +static int * const PKIFailureInfo_bits[] = { &hf_pkixtsp_PKIFailureInfo_badAlg, &hf_pkixtsp_PKIFailureInfo_spare_bit1, &hf_pkixtsp_PKIFailureInfo_badRequest, diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c index 9564fcd513..f84fc43b75 100644 --- a/epan/dissectors/packet-pnrp.c +++ b/epan/dissectors/packet-pnrp.c @@ -197,7 +197,7 @@ static gint hf_pnrp_message_inquire_flags_reserved2 = -1; static gint hf_pnrp_padding = -1; -static const int *inquire_flags[] = { +static int * const inquire_flags[] = { &hf_pnrp_message_inquire_flags_reserved1, &hf_pnrp_message_inquire_flags_Abit, &hf_pnrp_message_inquire_flags_Xbit, @@ -229,7 +229,7 @@ static gint hf_pnrp_message_authority_flags_Bbit = -1; static gint hf_pnrp_message_authority_flags_reserved3= -1; static gint hf_pnrp_message_authority_flags_Nbit = -1; -static const int *authority_flags[] = { +static int * const authority_flags[] = { &hf_pnrp_message_authority_flags_reserved1, &hf_pnrp_message_authority_flags_Lbit, &hf_pnrp_message_authority_flags_reserved2, @@ -268,7 +268,7 @@ static gint hf_pnrp_encodedCPA_flags_Cbit = -1; static gint hf_pnrp_encodedCPA_flags_Abit = -1; static gint hf_pnrp_encodedCPA_flags_Ubit = -1; static gint hf_pnrp_encodedCPA_flags_Rbit = -1; -static const int *encodedCPA_flags[] = { +static int * const encodedCPA_flags[] = { &hf_pnrp_encodedCPA_flags_reserved, &hf_pnrp_encodedCPA_flags_Xbit, &hf_pnrp_encodedCPA_flags_Fbit, @@ -289,7 +289,7 @@ static gint hf_pnrp_message_lookupControls_flags = -1; static gint hf_pnrp_message_lookupControls_flags_reserved = -1; static gint hf_pnrp_message_lookupControls_flags_Abit = -1; static gint hf_pnrp_message_lookupControls_flags_0bit = -1; -static const int *lookupControls_flags[] = { +static int * const lookupControls_flags[] = { &hf_pnrp_message_lookupControls_flags_reserved, &hf_pnrp_message_lookupControls_flags_Abit, &hf_pnrp_message_lookupControls_flags_0bit, diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c index f1ea45916a..e11161ffd8 100644 --- a/epan/dissectors/packet-ppi-antenna.c +++ b/epan/dissectors/packet-ppi-antenna.c @@ -113,7 +113,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d gchar *curr_str; int offset = 0; - static const int * ppi_antenna_present_flags[] = { + static int * const ppi_antenna_present_flags[] = { &hf_ppi_antenna_present_flags, &hf_ppi_antenna_present_gaindb, &hf_ppi_antenna_present_horizbw, @@ -129,7 +129,7 @@ dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d NULL }; - static const int * ppi_antenna_ant_flags[] = { + static int * const ppi_antenna_ant_flags[] = { &hf_ppi_antennaflags_mimo, &hf_ppi_antennaflags_horizpol, &hf_ppi_antennaflags_vertpol, diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c index 0cb5d2fef2..c8ee7c477d 100644 --- a/epan/dissectors/packet-ppi-gps.c +++ b/epan/dissectors/packet-ppi-gps.c @@ -123,7 +123,7 @@ dissect_ppi_gps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data proto_item *version_item, *length_item, *pt; proto_item *gps_line = NULL; - static const int * ppi_gps_present_flags[] = { + static int * const ppi_gps_present_flags[] = { &hf_ppi_gps_present_gpsflags_flags, &hf_ppi_gps_present_lat, &hf_ppi_gps_present_lon, @@ -141,7 +141,7 @@ dissect_ppi_gps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data NULL }; - static const int * ppi_antenna_gps_flags[] = { + static int * const ppi_antenna_gps_flags[] = { &hf_ppi_gps_gpsflags_flag0_nofix, &hf_ppi_gps_gpsflags_flag1_gpsfix, &hf_ppi_gps_gpsflags_flag2_diffgps, diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index b9adf5b663..137dc829dc 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -162,7 +162,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da const gchar *type_str = "Unknown sensor"; const gchar *unit_str = "Unknown unit"; - static const int * ppi_sensor_present_flags[] = { + static int * const ppi_sensor_present_flags[] = { &hf_ppi_sensor_present_sensortype, &hf_ppi_sensor_present_scalefactor, &hf_ppi_sensor_present_val_x, diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index ca9d67cf2b..b2ec635f97 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -293,7 +293,7 @@ dissect_ppi_vector_v1(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length guint32 appsecific_num; /* appdata parser should add a subtree based on this value */ guint32 flags=0, chars=0; - static const int * ppi_vector_present_flags[] = { + static int * const ppi_vector_present_flags[] = { &hf_ppi_vector_present_vflags, &hf_ppi_vector_present_vchars, &hf_ppi_vector_present_val_x, @@ -637,7 +637,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length gdouble err_rot, err_off; guint32 appsecific_num; /* appdata parser should add a subtree based on this value */ - static const int * ppi_vector_present_flags[] = { + static int * const ppi_vector_present_flags[] = { &hf_ppi_vector_present_vflags, &hf_ppi_vector_present_vchars, &hf_ppi_vector_present_val_x, diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 04556eeab1..bb581f302d 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -1856,7 +1856,7 @@ dissect_lcp_async_map_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v proto_tree *field_tree; proto_item *tf, *ti; int offset = 0; - static const int *asyncmap_fields[] = { + static int * const asyncmap_fields[] = { &hf_lcp_opt_asyncmap_us, &hf_lcp_opt_asyncmap_rs, &hf_lcp_opt_asyncmap_gs, &hf_lcp_opt_asyncmap_fs, &hf_lcp_opt_asyncmap_esc, &hf_lcp_opt_asyncmap_sub, @@ -2048,7 +2048,7 @@ dissect_lcp_fcs_alternatives_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_tree *field_tree; proto_item *tf; int offset = 0; - static const int *fcs_alternatives_fields[] = { + static int * const fcs_alternatives_fields[] = { &hf_lcp_opt_fcs_alternatives_ccitt32, &hf_lcp_opt_fcs_alternatives_ccitt16, &hf_lcp_opt_fcs_alternatives_null, @@ -2398,7 +2398,7 @@ dissect_lcp_cobs_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree *field_tree; proto_item *tf; int offset = 0; - static const int *cobs_flags_fields[] = { + static int * const cobs_flags_fields[] = { &hf_lcp_opt_cobs_flags_res, &hf_lcp_opt_cobs_flags_pre, &hf_lcp_opt_cobs_flags_zxe, @@ -3589,7 +3589,7 @@ dissect_ccp_stac_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_item *tf; int offset = 0; int length = tvb_reported_length(tvb); - static const int *check_mode_fields[] = { + static int * const check_mode_fields[] = { &hf_ccp_opt_cm_reserved, &hf_ccp_opt_cm_check_mode, NULL @@ -3662,7 +3662,7 @@ dissect_ccp_mppe_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree *field_tree; proto_item *tf; int offset = 0; - static const int *supported_bits_fields[] = { + static int * const supported_bits_fields[] = { &hf_ccp_opt_supported_bits_h, &hf_ccp_opt_supported_bits_m, &hf_ccp_opt_supported_bits_s, @@ -3716,7 +3716,7 @@ dissect_ccp_bsdcomp_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi proto_tree *field_tree; proto_item *tf; int offset = 0; - static const int *vd_fields[] = { + static int * const vd_fields[] = { &hf_ccp_opt_vd_vers, &hf_ccp_opt_vd_dict, NULL @@ -4931,7 +4931,7 @@ dissect_bcp_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint8 mac_type; gint captured_length, reported_length, pad_length; tvbuff_t *next_tvb; - static const int * bcp_bpdu_flags[] = { + static int * const bcp_bpdu_flags[] = { &hf_bcp_bpdu_fcs_present, &hf_bcp_bpdu_zeropad, &hf_bcp_bpdu_bcontrol, @@ -5172,7 +5172,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ tvbuff_t *next_tvb; int offset = 0, length_remaining; int length_field = 0, pid_field = 0, hdr_length = 0; - static const int * subframe_flags[] = { + static int * const subframe_flags[] = { &hf_pppmux_flags_pid, &hf_pppmux_flags_field_length, NULL @@ -5262,7 +5262,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ #define IPHC_CRTP_CS_CID8 1 #define IPHC_CRTP_CS_CID16 2 -static const int *iphc_crtp_fh_flags_fields[] = { +static int * const iphc_crtp_fh_flags_fields[] = { &hf_iphc_crtp_fh_cidlenflag, &hf_iphc_crtp_fh_dataflag, NULL @@ -5681,14 +5681,14 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) gint hdrlen; fragment_head *frag_mp; tvbuff_t *next_tvb; - static const int * mp_flags[] = { + static int * const mp_flags[] = { &hf_mp_frag_first, &hf_mp_frag_last, &hf_mp_sequence_num_cls, &hf_mp_sequence_num_reserved, NULL }; - static const int * mp_short_flags[] = { + static int * const mp_short_flags[] = { &hf_mp_frag_first, &hf_mp_frag_last, &hf_mp_short_sequence_num_cls, diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 853823f592..2f7a77af20 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -358,7 +358,7 @@ dissect_pres_Mode_selector(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * Protocol_version_bits[] = { +static int * const Protocol_version_bits[] = { &hf_pres_Protocol_version_version_1, NULL }; @@ -518,7 +518,7 @@ dissect_pres_Default_context_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * Presentation_requirements_bits[] = { +static int * const Presentation_requirements_bits[] = { &hf_pres_Presentation_requirements_context_management, &hf_pres_Presentation_requirements_restoration, NULL @@ -534,7 +534,7 @@ dissect_pres_Presentation_requirements(gboolean implicit_tag _U_, tvbuff_t *tvb } -static const int * User_session_requirements_bits[] = { +static int * const User_session_requirements_bits[] = { &hf_pres_User_session_requirements_half_duplex, &hf_pres_User_session_requirements_duplex, &hf_pres_User_session_requirements_expedited_data, @@ -561,7 +561,7 @@ dissect_pres_User_session_requirements(gboolean implicit_tag _U_, tvbuff_t *tvb } -static const int * Protocol_options_bits[] = { +static int * const Protocol_options_bits[] = { &hf_pres_Protocol_options_nominated_context, &hf_pres_Protocol_options_short_encoding, &hf_pres_Protocol_options_packed_encoding_rules, diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 90e4c780cb..c9fa28d442 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -1872,11 +1872,11 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U int codeset; gboolean non_locking_shift; #endif - static const int * ext_flags[] = { + static int * const ext_flags[] = { &hf_q2931_message_flag, NULL }; - static const int * ext_flags_follow_inst[] = { + static int * const ext_flags_follow_inst[] = { &hf_q2931_message_flag, &hf_q2931_message_action_indicator, NULL diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 49424746d5..6c74b04972 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -1971,7 +1971,7 @@ static void dissect_q931_pl_binary_parameters_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { - const int * fields[] = { + static int * const fields[] = { &hf_q931_fast_select, &hf_q931_pl_request, &hf_q931_pl_binary_confirmation, diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c index 56f58e1ea8..cd8d83323f 100644 --- a/epan/dissectors/packet-qnet6.c +++ b/epan/dissectors/packet-qnet6.c @@ -1967,7 +1967,7 @@ dissect_qnet6_kif_msgsend_msg_devctl(tvbuff_t * tvb, packet_info * pinfo, proto_ gint combine_len, left; const char *p; guint32 dcmd; - static const int *dcmd_fields[] = { + static int * const dcmd_fields[] = { &hf_qnet6_kif_msg_devctl_dcmd_cmd, &hf_qnet6_kif_msg_devctl_dcmd_class, &hf_qnet6_kif_msg_devctl_dcmd_ccmd, @@ -2031,7 +2031,7 @@ dissect_qnet6_kif_msgsend_msg_read(tvbuff_t * tvb, packet_info * pinfo _U_, prot int ret = -1; guint32 xtypes; gint combine_len, left; - static const int *xtypes_fields[] = { + static int * const xtypes_fields[] = { &hf_qnet6_kif_msg_io_read_xtypes_0_7, &hf_qnet6_kif_msg_io_read_xtypes_8, &hf_qnet6_kif_msg_io_read_xtypes_14, @@ -2098,7 +2098,7 @@ dissect_qnet6_kif_msgsend_msg_write(tvbuff_t * tvb, packet_info * pinfo _U_, pro int ret = -1; guint32 xtypes; gint combine_len, left; - static const int *xtypes_fields[] = { + static int * const xtypes_fields[] = { &hf_qnet6_kif_msg_io_write_xtypes_0_7, &hf_qnet6_kif_msg_io_write_xtypes_8, &hf_qnet6_kif_msg_io_write_xtypes_14, @@ -2274,7 +2274,7 @@ dissect_qnet6_kif_msgsend_msg_chmod(tvbuff_t * tvb, packet_info * pinfo _U_, pro { int ret = -1; gint combine_len, left; - static const int *chmod_fields[] = { + static int * const chmod_fields[] = { &hf_qnet6_kif_msg_io_chmod_other_exe, &hf_qnet6_kif_msg_io_chmod_other_write, &hf_qnet6_kif_msg_io_chmod_other_read, @@ -2526,7 +2526,7 @@ dissect_qnet6_kif_msgsend_msg_sync(tvbuff_t * tvb, packet_info * pinfo _U_, prot { int ret = -1; gint combine_len, left; - static const int *sync_fields[] = { + static int * const sync_fields[] = { &hf_qnet6_kif_msg_syncflag_dsync, &hf_qnet6_kif_msg_syncflag_sync, &hf_qnet6_kif_msg_syncflag_rsync, @@ -2651,7 +2651,7 @@ dissect_qnet6_kif_msgsend_msg_openfd(tvbuff_t * tvb, packet_info * pinfo _U_, pr int ret = -1; gint combine_len, left; proto_tree *stree; - static const int *openfd_ioflag_fields[] = { + static int * const openfd_ioflag_fields[] = { &hf_qnet6_kif_msg_openfd_ioflag_access, &hf_qnet6_kif_msg_openfd_ioflag_append, &hf_qnet6_kif_msg_openfd_ioflag_dsync, @@ -2716,7 +2716,7 @@ dissect_qnet6_kif_msgsend_msg_mmap(tvbuff_t * tvb, packet_info * pinfo _U_, prot int ret = -1; gint combine_len, left; proto_tree *stree; - static const int *prot_fields[] = { + static int * const prot_fields[] = { &hf_qnet6_kif_msg_io_mmap_prot_read, &hf_qnet6_kif_msg_io_mmap_prot_write, &hf_qnet6_kif_msg_io_mmap_prot_exec, @@ -2819,7 +2819,7 @@ dissect_qnet6_kif_msgsend_msg_notify(tvbuff_t * tvb, packet_info * pinfo _U_, pr guint64 timo; guint32 nfds, i, j, n, m; guint8 sevent[20], srevent[20]; /* enough to fit "read,write,rdband" */ - static const int *notify_flags_fields[] = { + static int * const notify_flags_fields[] = { &hf_qnet6_kif_msg_io_notify_flags_28, &hf_qnet6_kif_msg_io_notify_flags_29, &hf_qnet6_kif_msg_io_notify_flags_30, @@ -2988,7 +2988,7 @@ dissect_qnet6_kif_msgsend_msg(tvbuff_t * tvb, packet_info * pinfo, proto_tree * guint8 extra_type; gint rlen, head_len; int ret = -1; - static const int *ioflag_fields[] = { + static int * const ioflag_fields[] = { &hf_qnet6_kif_msg_connect_ioflag_access, &hf_qnet6_kif_msg_connect_ioflag_append, &hf_qnet6_kif_msg_connect_ioflag_dsync, @@ -3005,7 +3005,7 @@ dissect_qnet6_kif_msgsend_msg(tvbuff_t * tvb, packet_info * pinfo, proto_tree * &hf_qnet6_kif_msg_connect_ioflag_async, NULL }; - static const int *mode_fields[] = { + static int * const mode_fields[] = { &hf_qnet6_kif_msg_connect_mode_other_exe, &hf_qnet6_kif_msg_connect_mode_other_write, &hf_qnet6_kif_msg_connect_mode_other_read, @@ -3021,7 +3021,7 @@ dissect_qnet6_kif_msgsend_msg(tvbuff_t * tvb, packet_info * pinfo, proto_tree * &hf_qnet6_kif_msg_connect_mode_format, NULL }; - static const int *eflag_fields[] = { + static int * const eflag_fields[] = { &hf_qnet6_kif_msg_connect_eflag_dir, &hf_qnet6_kif_msg_connect_eflag_dot, &hf_qnet6_kif_msg_connect_eflag_dotdot, @@ -4017,7 +4017,7 @@ dissect_qnet6(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * dat gint offset = 0; gint len, plen, cklen; guint32 crc, crcp; - static const int * flags[] = { + static int * const flags[] = { &hf_qnet6_l4_flags_first, &hf_qnet6_l4_flags_last, &hf_qnet6_l4_flags_crc, diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 29543fb83a..5f10f449e6 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -4321,7 +4321,7 @@ static int dissect_qsig_cc_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /* --- Module Call-Offer-Operations-asn1-97 --- --- --- */ -static const int * qsig_co_ServiceList_bits[] = { +static int * const qsig_co_ServiceList_bits[] = { &hf_qsig_co_ServiceList_callOffer, NULL }; @@ -4906,7 +4906,7 @@ dissect_qsig_dnd_DNDOverrideArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } -static const int * qsig_dnd_ServiceList_bits[] = { +static int * const qsig_dnd_ServiceList_bits[] = { &hf_qsig_dnd_ServiceList_spare_bit0, &hf_qsig_dnd_ServiceList_dndo_low, &hf_qsig_dnd_ServiceList_dndo_medium, @@ -5081,7 +5081,7 @@ static int dissect_qsig_dnd_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /* --- Module Call-Intrusion-Operations-asn1-97 --- --- --- */ -static const int * qsig_ci_ServiceList_bits[] = { +static int * const qsig_ci_ServiceList_bits[] = { &hf_qsig_ci_ServiceList_spare_bit0, &hf_qsig_ci_ServiceList_spare_bit1, &hf_qsig_ci_ServiceList_spare_bit2, @@ -6883,7 +6883,7 @@ static int dissect_qsig_cint_CintExtension_PDU(tvbuff_t *tvb _U_, packet_info *p /* --- Module Common-Information-Operations-asn1-97 --- --- --- */ -static const int * qsig_cmn_FeatureIdList_bits[] = { +static int * const qsig_cmn_FeatureIdList_bits[] = { &hf_qsig_cmn_FeatureIdList_reserved, &hf_qsig_cmn_FeatureIdList_ssCFreRoutingSupported, &hf_qsig_cmn_FeatureIdList_ssCTreRoutingSupported, @@ -9924,7 +9924,7 @@ dissect_qsig_sms_SmSubmitParameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } -static const int * qsig_sms_SmscControlParameterHeader_bits[] = { +static int * const qsig_sms_SmscControlParameterHeader_bits[] = { &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted, &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError, &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying, diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c index 4b3f40e3ff..2b9c33884c 100644 --- a/epan/dissectors/packet-radius_packetcable.c +++ b/epan/dissectors/packet-radius_packetcable.c @@ -320,8 +320,8 @@ static const gchar* dissect_packetcable_qos_descriptor(proto_tree* tree, tvbuff_ guint32 intval; guint32 packetcable_qos_flags = tvb_get_ntohl(tvb, 0); guint packetcable_qos_off = 20; - static const int * qos_flags[] = { - &hf_packetcable_qos_status_indication, + static int * const qos_flags[] = { + &hf_packetcable_qos_status_indication, &hf_packetcable_qos_desc_flags_sfst, &hf_packetcable_qos_desc_flags_gi, &hf_packetcable_qos_desc_flags_tgj, @@ -406,7 +406,7 @@ static const gchar* dissect_packetcable_term_dsply_info(proto_tree* tree, tvbuff /* XXX - this logic seems buggy because the offsets don't line up */ guint8 bitmask = tvb_get_guint8(tvb, 2); guint intval = 1; - static const int * flags[] = { + static int * const flags[] = { &hf_packetcable_terminal_display_info_sbm_general_display, &hf_packetcable_terminal_display_info_sbm_calling_number, &hf_packetcable_terminal_display_info_sbm_calling_name, diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index 24daf481fb..f9c1fb73f2 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -925,7 +925,7 @@ raknet_dissect_common_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rak dissector_handle_t next_dissector; gint dissected; heur_dtbl_entry_t *hdtbl_entry; - const int* flag_flds[] = { + static int * const flag_flds[] = { &hf_raknet_message_reliability, &hf_raknet_message_has_split_packet, NULL @@ -1264,7 +1264,7 @@ raknet_dissect_connected_message(tvbuff_t *tvb, packet_info *pinfo, return tvb_captured_length(tvb); } else if (msg_type & (1 << 6)) { /* isACK */ - const int *ack_flds[] = { + static int * const ack_flds[] = { &hf_raknet_packet_is_for_connected, &hf_raknet_packet_is_ACK, &hf_raknet_packet_has_B_and_AS, @@ -1295,7 +1295,7 @@ raknet_dissect_connected_message(tvbuff_t *tvb, packet_info *pinfo, } } else if (msg_type & (1 << 5)) { /* isNAK */ - const int* nak_flds[] = { + static int * const nak_flds[] = { &hf_raknet_packet_is_for_connected, &hf_raknet_packet_is_ACK, &hf_raknet_packet_is_NAK, @@ -1327,7 +1327,7 @@ raknet_dissect_connected_message(tvbuff_t *tvb, packet_info *pinfo, */ guint32 packet_number; gboolean has_multiple_messages = FALSE; - const int* common_flds[] = { + static int * const common_flds[] = { &hf_raknet_packet_is_for_connected, &hf_raknet_packet_is_ACK, &hf_raknet_packet_is_NAK, diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 18fdb832a5..108c5b2950 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -2112,12 +2112,12 @@ dissect_rdpNegReq(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre guint64 flags; guint32 length; proto_item *length_item; - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_rdp_negReq_flag_restricted_admin_mode_req, &hf_rdp_negReq_flag_correlation_info_present, NULL }; - static const int *requestedProtocols_bits[] = { + static int * const requestedProtocols_bits[] = { &hf_rdp_requestedProtocols_flag_ssl, &hf_rdp_requestedProtocols_flag_hybrid, &hf_rdp_requestedProtocols_flag_hybrid_ex, @@ -2207,13 +2207,13 @@ static int dissect_rdpNegRsp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 length; proto_item *length_item; - static const int *flag_bits[] = { + static int * const flag_bits[] = { &hf_rdp_negRsp_flag_extended_client_data_supported, &hf_rdp_negRsp_flag_dynvc_gfx_protocol_supported, &hf_rdp_negRsp_flag_restricted_admin_mode_supported, NULL }; - static const int *selectedProtocol_bits[] = { + static int * const selectedProtocol_bits[] = { &hf_rdp_selectedProtocol_flag_ssl, &hf_rdp_selectedProtocol_flag_hybrid, &hf_rdp_selectedProtocol_flag_hybrid_ex, diff --git a/epan/dissectors/packet-rftap.c b/epan/dissectors/packet-rftap.c index 7b23818f1d..0ec76a0818 100644 --- a/epan/dissectors/packet-rftap.c +++ b/epan/dissectors/packet-rftap.c @@ -137,7 +137,7 @@ dissect_rftap_header(tvbuff_t *tvb, proto_tree *tree, guint32 *dlt, const guint8 gfloat float_val; char *power_units; - static const int *flag_fields[] = { + static int * const flag_fields[] = { &hf_rftap_present_dlt, &hf_rftap_present_freq, &hf_rftap_present_nomfreq, diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index afaf9cc68f..d34906aeca 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -592,7 +592,7 @@ dissect_rohc_ext_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int * | | if rtp = 1 * ..... ..... ..... ..... ..... ..... ..... ..... */ - static const int * ext3_flags[] = { + static int * const ext3_flags[] = { &hf_rohc_ext3_s, &hf_rohc_ext3_r_ts, &hf_rohc_ext3_tsc, @@ -609,7 +609,7 @@ dissect_rohc_ext_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset++; if (ext3_flags_value & ROHC_RTP_EXT3_IP_MASK) { - static const int * inner_ip_flags[] = { + static int * const inner_ip_flags[] = { &hf_rohc_ext3_inner_tos, &hf_rohc_ext3_inner_ttl, &hf_rohc_ext3_inner_df, @@ -635,7 +635,7 @@ dissect_rohc_ext_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset++; } if (ext3_inner_ip_flags_value & ROHC_RTP_EXT3_INNER_IP2_MASK) { - static const int * outer_ip_flags[] = { + static int * const outer_ip_flags[] = { &hf_rohc_ext3_outer_tos, &hf_rohc_ext3_outer_ttl, &hf_rohc_ext3_outer_df, @@ -740,7 +740,7 @@ dissect_rohc_ext_format(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int } if (ext3_flags_value & ROHC_RTP_EXT3_RTP_MASK) { guint64 ext3_rtp_flags_value = 0; - static const int * rtp_flags[] = { + static int * const rtp_flags[] = { &hf_rohc_ext3_mode, &hf_rohc_ext3_r_pt, &hf_rohc_ext3_m, diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index db05696405..8ccce36be7 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -88,7 +88,7 @@ static int hf_roofnet_link_seq = -1; static int hf_roofnet_link_age = -1; static int hf_roofnet_link_dst = -1; -static const int *flag_list[] = { +static int * const flag_list[] = { &hf_roofnet_flags_error, &hf_roofnet_flags_update, &hf_roofnet_flags_layer2, diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 050756bf8b..ca0f23a8ad 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -20098,7 +20098,7 @@ dissect_rrc_T_consecutive(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const int * T_bitmap_bits[] = { +static int * const T_bitmap_bits[] = { &hf_rrc_T_bitmap_chCode16_SF16, &hf_rrc_T_bitmap_chCode15_SF16, &hf_rrc_T_bitmap_chCode14_SF16, @@ -44953,7 +44953,7 @@ dissect_rrc_UL_SynchronisationParameters_r4(tvbuff_t *tvb _U_, int offset _U_, a } -static const int * T_sync_UL_CodesBitmap_bits[] = { +static int * const T_sync_UL_CodesBitmap_bits[] = { &hf_rrc_T_sync_UL_CodesBitmap_code7, &hf_rrc_T_sync_UL_CodesBitmap_code6, &hf_rrc_T_sync_UL_CodesBitmap_code5, @@ -52421,7 +52421,7 @@ dissect_rrc_INTEGER_2_5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_availableSYNC_UlCodesIndics_bits[] = { +static int * const T_availableSYNC_UlCodesIndics_bits[] = { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex7, &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex6, &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex5, @@ -52472,7 +52472,7 @@ dissect_rrc_T_size2_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_subchannels_08_bits[] = { +static int * const T_subchannels_08_bits[] = { &hf_rrc_T_subchannels_08_subCh3, &hf_rrc_T_subchannels_08_subCh2, &hf_rrc_T_subchannels_08_subCh1, @@ -52503,7 +52503,7 @@ dissect_rrc_T_size4_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_subchannels_09_bits[] = { +static int * const T_subchannels_09_bits[] = { &hf_rrc_T_subchannels_09_subCh7, &hf_rrc_T_subchannels_09_subCh6, &hf_rrc_T_subchannels_09_subCh5, @@ -52648,7 +52648,7 @@ dissect_rrc_T_max_SYNC_UL_Transmissions_02(tvbuff_t *tvb _U_, int offset _U_, as } -static const int * Sync_UL_Codes_Bitmap_bits[] = { +static int * const Sync_UL_Codes_Bitmap_bits[] = { &hf_rrc_Sync_UL_Codes_Bitmap_code7, &hf_rrc_Sync_UL_Codes_Bitmap_code6, &hf_rrc_Sync_UL_Codes_Bitmap_code5, @@ -54105,7 +54105,7 @@ dissect_rrc_T_consecutive_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * T_bitmap_01_bits[] = { +static int * const T_bitmap_01_bits[] = { &hf_rrc_T_bitmap_01_chCode32_SF32, &hf_rrc_T_bitmap_01_chCode31_SF32, &hf_rrc_T_bitmap_01_chCode30_SF32, @@ -92124,7 +92124,7 @@ dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * } -static const int * T_cipheringAlgorithmCap_bits[] = { +static int * const T_cipheringAlgorithmCap_bits[] = { &hf_rrc_T_cipheringAlgorithmCap_spare15, &hf_rrc_T_cipheringAlgorithmCap_spare14, &hf_rrc_T_cipheringAlgorithmCap_spare13, @@ -92153,7 +92153,7 @@ dissect_rrc_T_cipheringAlgorithmCap(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } -static const int * T_integrityProtectionAlgorithmCap_bits[] = { +static int * const T_integrityProtectionAlgorithmCap_bits[] = { &hf_rrc_T_integrityProtectionAlgorithmCap_spare15, &hf_rrc_T_integrityProtectionAlgorithmCap_spare14, &hf_rrc_T_integrityProtectionAlgorithmCap_spare13, @@ -92197,7 +92197,7 @@ dissect_rrc_SecurityCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const int * GsmSecurityCapability_bits[] = { +static int * const GsmSecurityCapability_bits[] = { &hf_rrc_GsmSecurityCapability_a5_7, &hf_rrc_GsmSecurityCapability_a5_6, &hf_rrc_GsmSecurityCapability_a5_5, @@ -142650,7 +142650,7 @@ dissect_rrc_AC_To_ASC_MappingTable(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * T_assignedSubChannelNumber_bits[] = { +static int * const T_assignedSubChannelNumber_bits[] = { &hf_rrc_T_assignedSubChannelNumber_b3, &hf_rrc_T_assignedSubChannelNumber_b2, &hf_rrc_T_assignedSubChannelNumber_b1, @@ -142683,7 +142683,7 @@ dissect_rrc_AccessServiceClass_FDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * T_channelisationCodeIndices_bits[] = { +static int * const T_channelisationCodeIndices_bits[] = { &hf_rrc_T_channelisationCodeIndices_chCodeIndex7, &hf_rrc_T_channelisationCodeIndices_chCodeIndex6, &hf_rrc_T_channelisationCodeIndices_chCodeIndex5, @@ -142734,7 +142734,7 @@ dissect_rrc_T_size2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } -static const int * T_subchannels_01_bits[] = { +static int * const T_subchannels_01_bits[] = { &hf_rrc_T_subchannels_01_subCh3, &hf_rrc_T_subchannels_01_subCh2, &hf_rrc_T_subchannels_01_subCh1, @@ -142765,7 +142765,7 @@ dissect_rrc_T_size4(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } -static const int * T_subchannels_02_bits[] = { +static int * const T_subchannels_02_bits[] = { &hf_rrc_T_subchannels_02_subCh7, &hf_rrc_T_subchannels_02_subCh6, &hf_rrc_T_subchannels_02_subCh5, @@ -142841,7 +142841,7 @@ dissect_rrc_AccessServiceClass_TDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * T_channelisationCodeIndices_01_bits[] = { +static int * const T_channelisationCodeIndices_01_bits[] = { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex15, &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex14, &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex13, @@ -142900,7 +142900,7 @@ dissect_rrc_T_size2_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_subchannels_04_bits[] = { +static int * const T_subchannels_04_bits[] = { &hf_rrc_T_subchannels_04_subCh3, &hf_rrc_T_subchannels_04_subCh2, &hf_rrc_T_subchannels_04_subCh1, @@ -142931,7 +142931,7 @@ dissect_rrc_T_size4_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_subchannels_05_bits[] = { +static int * const T_subchannels_05_bits[] = { &hf_rrc_T_subchannels_05_subCh7, &hf_rrc_T_subchannels_05_subCh6, &hf_rrc_T_subchannels_05_subCh5, @@ -142966,7 +142966,7 @@ dissect_rrc_T_size8_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_subchannels_06_bits[] = { +static int * const T_subchannels_06_bits[] = { &hf_rrc_T_subchannels_06_subCh15, &hf_rrc_T_subchannels_06_subCh14, &hf_rrc_T_subchannels_06_subCh13, @@ -143207,7 +143207,7 @@ dissect_rrc_ASCSetting_TDD_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const int * AvailableSignatures_bits[] = { +static int * const AvailableSignatures_bits[] = { &hf_rrc_AvailableSignatures_signature15, &hf_rrc_AvailableSignatures_signature14, &hf_rrc_AvailableSignatures_signature13, @@ -143236,7 +143236,7 @@ dissect_rrc_AvailableSignatures(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -static const int * AvailableSubChannelNumbers_bits[] = { +static int * const AvailableSubChannelNumbers_bits[] = { &hf_rrc_AvailableSubChannelNumbers_subCh11, &hf_rrc_AvailableSubChannelNumbers_subCh10, &hf_rrc_AvailableSubChannelNumbers_subCh9, diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 81d1c07290..087b76aeef 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -2754,7 +2754,7 @@ dissect_rrlp_Rel5_MsrPosition_Req_Extension(tvbuff_t *tvb _U_, int offset _U_, a } -static const int * GANSSPositioningMethod_bits[] = { +static int * const GANSSPositioningMethod_bits[] = { &hf_rrlp_GANSSPositioningMethod_gps, &hf_rrlp_GANSSPositioningMethod_galileo, &hf_rrlp_GANSSPositioningMethod_sbas, @@ -3792,7 +3792,7 @@ dissect_rrlp_GANSSNavModel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * GANSSSignals_bits[] = { +static int * const GANSSSignals_bits[] = { &hf_rrlp_GANSSSignals_signal1, &hf_rrlp_GANSSSignals_signal2, &hf_rrlp_GANSSSignals_signal3, @@ -6432,7 +6432,7 @@ dissect_rrlp_INTEGER_0_16384(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * PositionData_bits[] = { +static int * const PositionData_bits[] = { &hf_rrlp_PositionData_e_otd, &hf_rrlp_PositionData_gps, &hf_rrlp_PositionData_galileo, @@ -6799,7 +6799,7 @@ dissect_rrlp_ProtocolError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * GANSSPositioningMethodTypes_bits[] = { +static int * const GANSSPositioningMethodTypes_bits[] = { &hf_rrlp_GANSSPositioningMethodTypes_msAssisted, &hf_rrlp_GANSSPositioningMethodTypes_msBased, &hf_rrlp_GANSSPositioningMethodTypes_standalone, @@ -6815,7 +6815,7 @@ dissect_rrlp_GANSSPositioningMethodTypes(tvbuff_t *tvb _U_, int offset _U_, asn1 } -static const int * SBASID_bits[] = { +static int * const SBASID_bits[] = { &hf_rrlp_SBASID_waas, &hf_rrlp_SBASID_egnos, &hf_rrlp_SBASID_masas, @@ -6879,7 +6879,7 @@ dissect_rrlp_PosCapability_Req(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const int * NonGANSSPositionMethods_bits[] = { +static int * const NonGANSSPositionMethods_bits[] = { &hf_rrlp_NonGANSSPositionMethods_msAssistedEOTD, &hf_rrlp_NonGANSSPositionMethods_msBasedEOTD, &hf_rrlp_NonGANSSPositionMethods_msAssistedGPS, @@ -6897,7 +6897,7 @@ dissect_rrlp_NonGANSSPositionMethods(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const int * MultipleMeasurementSets_bits[] = { +static int * const MultipleMeasurementSets_bits[] = { &hf_rrlp_MultipleMeasurementSets_eotd, &hf_rrlp_MultipleMeasurementSets_gps, &hf_rrlp_MultipleMeasurementSets_ganss, @@ -6929,7 +6929,7 @@ dissect_rrlp_PosCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const int * GPSAssistance_bits[] = { +static int * const GPSAssistance_bits[] = { &hf_rrlp_GPSAssistance_almanac, &hf_rrlp_GPSAssistance_uTCmodel, &hf_rrlp_GPSAssistance_ionosphericModel, @@ -6953,7 +6953,7 @@ dissect_rrlp_GPSAssistance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ } -static const int * CommonGANSSAssistance_bits[] = { +static int * const CommonGANSSAssistance_bits[] = { &hf_rrlp_CommonGANSSAssistance_referenceTime, &hf_rrlp_CommonGANSSAssistance_referenceLocation, &hf_rrlp_CommonGANSSAssistance_spare_bit2, @@ -6972,7 +6972,7 @@ dissect_rrlp_CommonGANSSAssistance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const int * GANSSAssistance_bits[] = { +static int * const GANSSAssistance_bits[] = { &hf_rrlp_GANSSAssistance_realTimeIntegrity, &hf_rrlp_GANSSAssistance_differentialCorrections, &hf_rrlp_GANSSAssistance_almanac, @@ -7041,7 +7041,7 @@ dissect_rrlp_GANSSAssistanceSet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a } -static const int * GANSSModelID_bits[] = { +static int * const GANSSModelID_bits[] = { &hf_rrlp_GANSSModelID_model1, &hf_rrlp_GANSSModelID_model2, &hf_rrlp_GANSSModelID_model3, diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c index e24c2f9b1f..535fb627b4 100644 --- a/epan/dissectors/packet-rsvd.c +++ b/epan/dissectors/packet-rsvd.c @@ -621,7 +621,7 @@ static const value_string svhdx_snapshot_stage_vals[] = { static int dissect_RSVD2_META_OPERATION_START(tvbuff_t *tvb, proto_tree *parent_tree, int offset, gint16 len, gboolean request) { - static const int * meta_operation_create_snapshot_flags[] = { + static int * const meta_operation_create_snapshot_flags[] = { &hf_svhdx_tunnel_create_snapshot_flag_enable_change_tracking, NULL }; diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 5204179323..114bd34bc8 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -5613,7 +5613,7 @@ dissect_rsvp_admin_status(proto_tree *ti, proto_tree *rsvp_object_tree, { int offset2 = offset + 4; guint32 status; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_rsvp_filter[RSVPF_ADMIN_STATUS_REFLECT], &hf_rsvp_filter[RSVPF_ADMIN_STATUS_HANDOVER], &hf_rsvp_filter[RSVPF_ADMIN_STATUS_LOCKOUT], @@ -5667,7 +5667,7 @@ dissect_rsvp_lsp_attributes(proto_tree *ti, packet_info* pinfo, proto_tree *rsvp guint32 attributes; guint16 tlv_type, tlv_len; proto_tree *ti2, *rsvp_lsp_attr_subtree; - static const int * rsvp_lsp_attr_flags[] = { + static int * const rsvp_lsp_attr_flags[] = { &hf_rsvp_lsp_attr_e2e, &hf_rsvp_lsp_attr_boundary, &hf_rsvp_lsp_attr_segment, diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 04eb46742b..8c798f23d8 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2321,7 +2321,7 @@ dissect_rtcp_mcptt_location_ie(tvbuff_t* tvb, packet_info* pinfo, int offset, pr { guint32 loc_type; int start_offset = offset; - const int* ECGI_flags[] = { + static int * const ECGI_flags[] = { &hf_rtcp_mcptt_enodebid, &hf_rtcp_mcptt_cellid, NULL @@ -2981,7 +2981,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree, static void parse_xr_type_specific_field(tvbuff_t *tvb, gint offset, guint block_type, proto_tree *tree, guint8 *thinning) { - static const int * flags[] = { + static int * const flags[] = { &hf_rtcp_xr_stats_loss_flag, &hf_rtcp_xr_stats_dup_flag, &hf_rtcp_xr_stats_jitter_flag, diff --git a/epan/dissectors/packet-rtls.c b/epan/dissectors/packet-rtls.c index d61e094e1b..d366e3762a 100644 --- a/epan/dissectors/packet-rtls.c +++ b/epan/dissectors/packet-rtls.c @@ -86,7 +86,7 @@ static int hf_rtls_aer_match_type = -1; static int hf_rtls_aer_match_method = -1; static int hf_rtls_cmr_messages = -1; -static const int *rtls_nack_flags[] = { +static int * const rtls_nack_flags[] = { &hf_rtls_nack_flags_internal_error, &hf_rtls_nack_flags_station_not_found, &hf_rtls_nack_flags_reserved, diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index 82f0a8b8b5..fb7fb2ac8b 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -317,7 +317,7 @@ dissect_rtp_events( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d guint8 rtp_evt; guint8 octet; - static const int * events[] = { + static int * const events[] = { &hf_rtp_events_end, &hf_rtp_events_reserved, &hf_rtp_events_volume, diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c index d7a5784001..f4ab6b9cee 100644 --- a/epan/dissectors/packet-rtp-midi.c +++ b/epan/dissectors/packet-rtp-midi.c @@ -4930,7 +4930,7 @@ decode_cj_chapter_m( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have a entry-msb field? */ if ( logitemheader & RTP_MIDI_CJ_CHAPTER_M_FLAG_J ) { - static const int * msb_flags[] = { + static int * const msb_flags[] = { &hf_rtp_midi_cj_chapter_m_log_msb_x, &hf_rtp_midi_cj_chapter_m_log_msb, NULL @@ -4944,7 +4944,7 @@ decode_cj_chapter_m( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have a entry-lsb field? */ if ( logitemheader & RTP_MIDI_CJ_CHAPTER_M_FLAG_K ) { - static const int * lsb_flags[] = { + static int * const lsb_flags[] = { &hf_rtp_midi_cj_chapter_m_log_lsb_x, &hf_rtp_midi_cj_chapter_m_log_lsb, NULL @@ -4957,7 +4957,7 @@ decode_cj_chapter_m( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have an a-button field? */ if ( logitemheader & RTP_MIDI_CJ_CHAPTER_M_FLAG_L ) { - static const int * button_flags[] = { + static int * const button_flags[] = { &hf_rtp_midi_cj_chapter_m_log_a_button_g, &hf_rtp_midi_cj_chapter_m_log_a_button_x, &hf_rtp_midi_cj_chapter_m_log_a_button, @@ -4972,7 +4972,7 @@ decode_cj_chapter_m( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have a c-button field? */ if ( logitemheader & RTP_MIDI_CJ_CHAPTER_M_FLAG_M ) { - static const int * button_flags[] = { + static int * const button_flags[] = { &hf_rtp_midi_cj_chapter_m_log_c_button_g, &hf_rtp_midi_cj_chapter_m_log_c_button_r, &hf_rtp_midi_cj_chapter_m_log_c_button, @@ -4987,7 +4987,7 @@ decode_cj_chapter_m( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have a count field? */ if ( logitemheader & RTP_MIDI_CJ_CHAPTER_M_FLAG_N ) { - static const int * log_flags[] = { + static int * const log_flags[] = { &hf_rtp_midi_cj_chapter_m_log_count_x, &hf_rtp_midi_cj_chapter_m_log_count, NULL @@ -5353,7 +5353,7 @@ decode_channel_journal( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Do we have channel aftertouch chapter? */ if ( chanflags & RTP_MIDI_CJ_FLAG_T ) { - static const int * flags_t[] = { + static int * const flags_t[] = { &hf_rtp_midi_cj_chapter_t_sflag, &hf_rtp_midi_cj_chapter_t_pressure, NULL @@ -5648,7 +5648,7 @@ decode_sj_chapter_d( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un unsigned int start_offset = offset; int ext_consumed; - static const int * chapter_d_flags[] = { + static int * const chapter_d_flags[] = { &hf_rtp_midi_sj_chapter_d_sflag, &hf_rtp_midi_sj_chapter_d_bflag, &hf_rtp_midi_sj_chapter_d_gflag, @@ -5676,7 +5676,7 @@ decode_sj_chapter_d( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have Reset field? */ if ( header & RTP_MIDI_SJ_CHAPTER_D_FLAG_B ) { - static const int * reset_flags[] = { + static int * const reset_flags[] = { &hf_rtp_midi_sj_chapter_d_reset_sflag, &hf_rtp_midi_sj_chapter_d_reset_count, NULL @@ -5689,7 +5689,7 @@ decode_sj_chapter_d( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have Tune request field? */ if ( header & RTP_MIDI_SJ_CHAPTER_D_FLAG_G ) { - static const int * tune_flags[] = { + static int * const tune_flags[] = { &hf_rtp_midi_sj_chapter_d_tune_sflag, &hf_rtp_midi_sj_chapter_d_tune_count, NULL @@ -5702,7 +5702,7 @@ decode_sj_chapter_d( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un /* do we have Song select field? */ if ( header & RTP_MIDI_SJ_CHAPTER_D_FLAG_H ) { - static const int * song_flags[] = { + static int * const song_flags[] = { &hf_rtp_midi_sj_chapter_d_song_sel_sflag, &hf_rtp_midi_sj_chapter_d_song_sel_value, NULL @@ -5840,7 +5840,7 @@ decode_sj_chapter_f( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un if ( header & RTP_MIDI_SJ_CHAPTER_F_FLAG_C ) { if ( header & RTP_MIDI_SJ_CHAPTER_F_FLAG_Q ) { - static const int * fq_flags[] = { + static int * const fq_flags[] = { &hf_rtp_midi_sj_chapter_f_mt0, &hf_rtp_midi_sj_chapter_f_mt1, &hf_rtp_midi_sj_chapter_f_mt2, @@ -5854,7 +5854,7 @@ decode_sj_chapter_f( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un proto_tree_add_bitmask(rtp_midi_sj_chapter_tree, tvb, offset, hf_rtp_midi_sj_chapter_f_complete, ett_rtp_midi_sj_chapter_f_complete, fq_flags, ENC_BIG_ENDIAN); } else { - static const int * f_flags[] = { + static int * const f_flags[] = { &hf_rtp_midi_sj_chapter_f_hr, &hf_rtp_midi_sj_chapter_f_mn, &hf_rtp_midi_sj_chapter_f_sc, @@ -5869,7 +5869,7 @@ decode_sj_chapter_f( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un } if ( header & RTP_MIDI_SJ_CHAPTER_F_FLAG_P ) { - static const int * fp_flags[] = { + static int * const fp_flags[] = { &hf_rtp_midi_sj_chapter_f_mt0, &hf_rtp_midi_sj_chapter_f_mt1, &hf_rtp_midi_sj_chapter_f_mt2, @@ -6044,7 +6044,7 @@ decode_system_journal( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* Do we have a active sensing chapter? */ if ( systemflags & RTP_MIDI_SJ_FLAG_V ) { - static const int * v_flags[] = { + static int * const v_flags[] = { &hf_rtp_midi_sj_chapter_v_sflag, &hf_rtp_midi_sj_chapter_v_count, NULL diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 404f51378e..84c64c99bf 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1858,7 +1858,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ static struct _rtp_info rtp_info_arr[4]; static int rtp_info_current = 0; struct _rtp_info *rtp_info; - static const int * octet1_fields[] = { + static int * const octet1_fields[] = { &hf_rtp_version, &hf_rtp_padding, &hf_rtp_extension, @@ -2343,7 +2343,7 @@ dissect_rtp_shim_header(tvbuff_t *tvb, gint start, packet_info *pinfo _U_, proto guint32 timestamp; guint32 sync_src; const char *pt = NULL; - static const int * octet1_fields[] = { + static int * const octet1_fields[] = { &hf_rtp_version, &hf_rtp_padding, &hf_rtp_extension, diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index bee7ec5ca3..203de4259a 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -1147,14 +1147,14 @@ static const value_string acknowledgement_kind_vals[] = { { 0, NULL } }; -static const int* TYPE_FLAG_FLAGS[] = { +static int* const TYPE_FLAG_FLAGS[] = { &hf_rtps_flag_typeflag_nested, /* Bit 2 */ &hf_rtps_flag_typeflag_mutable, /* Bit 1 */ &hf_rtps_flag_typeflag_final, /* Bit 0 */ NULL }; -static const int* MEMBER_FLAGS[] = { +static int* const MEMBER_FLAGS[] = { &hf_rtps_flag_memberflag_union_default, /* Bit 3 */ &hf_rtps_flag_memberflag_shareable, /* Bit 2 */ &hf_rtps_flag_memberflag_optional, /* Bit 1 */ @@ -1187,7 +1187,7 @@ const value_string class_id_enum_names[] = { { 0, NULL} }; -static const int* PAD_FLAGS[] = { +static int* const PAD_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1199,7 +1199,7 @@ static const int* PAD_FLAGS[] = { NULL }; -static const int* DATA_FLAGSv1[] = { +static int* const DATA_FLAGSv1[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_unregister, /* Bit 5 */ @@ -1211,7 +1211,7 @@ static const int* DATA_FLAGSv1[] = { NULL }; -static const int* DATA_FLAGSv2[] = { +static int* const DATA_FLAGSv2[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1223,7 +1223,7 @@ static const int* DATA_FLAGSv2[] = { NULL }; -static const int* NOKEY_DATA_FRAG_FLAGS[] = { +static int* const NOKEY_DATA_FRAG_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1235,7 +1235,7 @@ static const int* NOKEY_DATA_FRAG_FLAGS[] = { NULL }; -static const int* NOKEY_DATA_FLAGS[] = { +static int* const NOKEY_DATA_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1247,7 +1247,7 @@ static const int* NOKEY_DATA_FLAGS[] = { NULL }; -static const int* ACKNACK_FLAGS[] = { +static int* const ACKNACK_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1259,7 +1259,7 @@ static const int* ACKNACK_FLAGS[] = { NULL }; -static const int* NACK_FRAG_FLAGS[] = { +static int* const NACK_FRAG_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1271,7 +1271,7 @@ static const int* NACK_FRAG_FLAGS[] = { NULL }; -static const int* GAP_FLAGS[] = { +static int* const GAP_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1283,7 +1283,7 @@ static const int* GAP_FLAGS[] = { NULL }; -static const int* HEARTBEAT_FLAGS[] = { +static int* const HEARTBEAT_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1295,7 +1295,7 @@ static const int* HEARTBEAT_FLAGS[] = { NULL }; -static const int* HEARTBEAT_BATCH_FLAGS[] = { +static int* const HEARTBEAT_BATCH_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1307,7 +1307,7 @@ static const int* HEARTBEAT_BATCH_FLAGS[] = { NULL }; -static const int* HEARTBEAT_FRAG_FLAGS[] = { +static int* const HEARTBEAT_FRAG_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1319,7 +1319,7 @@ static const int* HEARTBEAT_FRAG_FLAGS[] = { NULL }; -static const int* RTPS_DATA_FLAGS[] = { +static int* const RTPS_DATA_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1331,7 +1331,7 @@ static const int* RTPS_DATA_FLAGS[] = { NULL }; -static const int* RTPS_DATA_FRAG_FLAGS[] = { +static int* const RTPS_DATA_FRAG_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1343,7 +1343,7 @@ static const int* RTPS_DATA_FRAG_FLAGS[] = { NULL }; -static const int* RTPS_DATA_BATCH_FLAGS[] = { +static int* const RTPS_DATA_BATCH_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1355,7 +1355,7 @@ static const int* RTPS_DATA_BATCH_FLAGS[] = { NULL }; -static const int* RTPS_SAMPLE_INFO_FLAGS16[] = { +static int* const RTPS_SAMPLE_INFO_FLAGS16[] = { &hf_rtps_flag_reserved8000, /* Bit 15 */ &hf_rtps_flag_reserved4000, /* Bit 14 */ &hf_rtps_flag_reserved2000, /* Bit 13 */ @@ -1375,7 +1375,7 @@ static const int* RTPS_SAMPLE_INFO_FLAGS16[] = { NULL }; -static const int* INFO_TS_FLAGS[] = { +static int* const INFO_TS_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1387,7 +1387,7 @@ static const int* INFO_TS_FLAGS[] = { NULL }; -static const int* INFO_SRC_FLAGS[] = { +static int* const INFO_SRC_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1399,7 +1399,7 @@ static const int* INFO_SRC_FLAGS[] = { NULL }; -static const int* INFO_REPLY_IP4_FLAGS[] = { +static int* const INFO_REPLY_IP4_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1411,7 +1411,7 @@ static const int* INFO_REPLY_IP4_FLAGS[] = { NULL }; -static const int* INFO_DST_FLAGS[] = { +static int* const INFO_DST_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1423,7 +1423,7 @@ static const int* INFO_DST_FLAGS[] = { NULL }; -static const int* INFO_REPLY_FLAGS[] = { +static int* const INFO_REPLY_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1435,7 +1435,7 @@ static const int* INFO_REPLY_FLAGS[] = { NULL }; -static const int * RTI_CRC_FLAGS[] = { +static int* const RTI_CRC_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1447,7 +1447,7 @@ static const int * RTI_CRC_FLAGS[] = { NULL }; /* It is a 4 bytes field but with these 8 bits is enough */ -static const int* STATUS_INFO_FLAGS[] = { +static int* const STATUS_INFO_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1459,7 +1459,7 @@ static const int* STATUS_INFO_FLAGS[] = { NULL }; -static const int* BUILTIN_ENDPOINT_FLAGS[] = { +static int* const BUILTIN_ENDPOINT_FLAGS[] = { &hf_rtps_flag_participant_secure_reader, /* Bit 27 */ &hf_rtps_flag_participant_secure_writer, /* Bit 26 */ &hf_rtps_flag_secure_participant_volatile_message_reader, /* Bit 25 */ @@ -1488,7 +1488,7 @@ static const int* BUILTIN_ENDPOINT_FLAGS[] = { NULL }; -static const int* SECURE_FLAGS[] = { +static int* const SECURE_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1500,7 +1500,7 @@ static const int* SECURE_FLAGS[] = { NULL }; -static const int* SECURE_PREFIX_FLAGS[] = { +static int* const SECURE_PREFIX_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1512,7 +1512,7 @@ static const int* SECURE_PREFIX_FLAGS[] = { NULL }; -static const int* SECURE_POSTFIX_FLAGS[] = { +static int* const SECURE_POSTFIX_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1524,7 +1524,7 @@ static const int* SECURE_POSTFIX_FLAGS[] = { NULL }; -static const int* ENDPOINT_SECURITY_INFO_FLAGS[] = { +static int* const ENDPOINT_SECURITY_INFO_FLAGS[] = { &hf_rtps_flag_endpoint_security_attribute_flag_is_valid, /* Bit 31 */ &hf_rtps_flag_endpoint_security_attribute_flag_is_liveliness_protected, /* Bit 6 */ &hf_rtps_flag_endpoint_security_attribute_flag_is_key_protected, /* Bit 5 */ @@ -1536,14 +1536,14 @@ static const int* ENDPOINT_SECURITY_INFO_FLAGS[] = { NULL }; -static const int* PLUGIN_ENDPOINT_SECURITY_INFO_FLAGS[] = { +static int* const PLUGIN_ENDPOINT_SECURITY_INFO_FLAGS[] = { &hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_valid, /* Bit 31 */ &hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_liveliness_encrypted, /* Bit 2 */ &hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_key_encrypted, /* Bit 1 */ &hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_payload_encrypted, /* Bit 0 */ NULL }; -static const int* PARTICIPANT_SECURITY_INFO_FLAGS[] = { +static int* const PARTICIPANT_SECURITY_INFO_FLAGS[] = { &hf_rtps_flag_participant_security_attribute_flag_is_valid, /* Bit 31 */ &hf_rtps_flag_participant_security_attribute_flag_is_liveliness_protected, /* Bit 2 */ &hf_rtps_flag_participant_security_attribute_flag_is_discovery_protected, /* Bit 1 */ @@ -1551,7 +1551,7 @@ static const int* PARTICIPANT_SECURITY_INFO_FLAGS[] = { NULL }; -static const int* PLUGIN_PARTICIPANT_SECURITY_INFO_FLAGS[] = { +static int* const PLUGIN_PARTICIPANT_SECURITY_INFO_FLAGS[] = { &hf_rtps_flag_plugin_participant_security_attribute_flag_is_valid, /* Bit 31 */ &hf_rtps_flag_plugin_participant_security_attribute_flag_is_liveliness_origin_encrypted, /* Bit 5 */ &hf_rtps_flag_plugin_participant_security_attribute_flag_is_discovery_origin_encrypted, /* Bit 4 */ @@ -1563,7 +1563,7 @@ static const int* PLUGIN_PARTICIPANT_SECURITY_INFO_FLAGS[] = { }; /* Vendor specific: RTI */ -static const int* APP_ACK_FLAGS[] = { +static int* const APP_ACK_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1575,7 +1575,7 @@ static const int* APP_ACK_FLAGS[] = { NULL }; /* Vendor specific: RTI */ -static const int* APP_ACK_CONF_FLAGS[] = { +static int* const APP_ACK_CONF_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1587,7 +1587,7 @@ static const int* APP_ACK_CONF_FLAGS[] = { NULL }; /* Vendor specific: RTI */ -static const int* HEARTBEAT_VIRTUAL_FLAGS[] = { +static int* const HEARTBEAT_VIRTUAL_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1599,7 +1599,7 @@ static const int* HEARTBEAT_VIRTUAL_FLAGS[] = { NULL }; /* Vendor specific: RTI */ -static const int* DATA_FRAG_FLAGS[] = { +static int* const DATA_FRAG_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1612,7 +1612,7 @@ static const int* DATA_FRAG_FLAGS[] = { }; #if 0 /* Vendor specific: RTI */ -static const int* NACK_FLAGS[] = { +static int* const NACK_FLAGS[] = { &hf_rtps_flag_reserved80, /* Bit 7 */ &hf_rtps_flag_reserved40, /* Bit 6 */ &hf_rtps_flag_reserved20, /* Bit 5 */ @@ -1625,7 +1625,7 @@ static const int* NACK_FLAGS[] = { }; #endif -static const int* VENDOR_BUILTIN_ENDPOINT_FLAGS[] = { +static int* const VENDOR_BUILTIN_ENDPOINT_FLAGS[] = { &hf_rtps_flag_secure_service_request_reader, /* Bit 5 */ &hf_rtps_flag_secure_service_request_writer, /* Bit 4 */ &hf_rtps_flag_locator_ping_reader, /* Bit 3 */ @@ -1635,7 +1635,7 @@ static const int* VENDOR_BUILTIN_ENDPOINT_FLAGS[] = { NULL }; -static const int* ENDPOINT_SECURITY_ATTRIBUTES[] = { +static int* const ENDPOINT_SECURITY_ATTRIBUTES[] = { &hf_rtps_flag_security_payload_protected, /* Bit 3 */ &hf_rtps_flag_security_submessage_protected, /* Bit 2 */ &hf_rtps_flag_security_discovery_protected, /* Bit 1 */ diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 4ff8170e78..9f762834ea 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -65,7 +65,7 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree, void* dat proto_tree *rudp_tree; proto_item *ti; guint8 hlen; - static const int * flags[] = { + static int * const flags[] = { &hf_rudp_flags_syn, &hf_rudp_flags_ack, &hf_rudp_flags_eak, diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index b743d37a1b..8f9b25d987 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -395,7 +395,7 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int static int dissect_rx_flags(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_rx_flags_free_packet, &hf_rx_flags_more_packets, &hf_rx_flags_last_packet, diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index f3530dc423..4e4c41dfcc 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -5395,7 +5395,7 @@ dissect_s1ap_EncryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_encryptionAlgorithms_EEA1, &hf_s1ap_encryptionAlgorithms_EEA2, &hf_s1ap_encryptionAlgorithms_EEA3, @@ -6269,7 +6269,7 @@ dissect_s1ap_MeasurementsToActivate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_measurementsToActivate_M1, &hf_s1ap_measurementsToActivate_M2, &hf_s1ap_measurementsToActivate_M3, @@ -6520,7 +6520,7 @@ dissect_s1ap_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, as 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_integrityProtectionAlgorithms_EIA1, &hf_s1ap_integrityProtectionAlgorithms_EIA2, &hf_s1ap_integrityProtectionAlgorithms_EIA3, @@ -6546,7 +6546,7 @@ dissect_s1ap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_interfacesToTrace_S1_MME, &hf_s1ap_interfacesToTrace_X2, &hf_s1ap_interfacesToTrace_Uu, @@ -7176,7 +7176,7 @@ dissect_s1ap_MDT_Location_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_MDT_Location_Info_GNSS, &hf_s1ap_MDT_Location_Info_E_CID, &hf_s1ap_MDT_Location_Info_Reserved, @@ -7683,7 +7683,7 @@ dissect_s1ap_NRencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_NRencryptionAlgorithms_NEA1, &hf_s1ap_NRencryptionAlgorithms_NEA2, &hf_s1ap_NRencryptionAlgorithms_NEA3, @@ -7709,7 +7709,7 @@ dissect_s1ap_NRintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_NRintegrityProtectionAlgorithms_NIA1, &hf_s1ap_NRintegrityProtectionAlgorithms_NIA2, &hf_s1ap_NRintegrityProtectionAlgorithms_NIA3, @@ -9994,7 +9994,7 @@ dissect_s1ap_UE_Application_Layer_Measurement_Capability(tvbuff_t *tvb _U_, int 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_streaming_service, &hf_s1ap_UE_Application_Layer_Measurement_Capability_QoE_Measurement_for_MTSI_service, &hf_s1ap_UE_Application_Layer_Measurement_Capability_Reserved, diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 4897f56268..ec9dc993d4 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -1248,7 +1248,7 @@ static gint hf_s7comm_userdata_blockinfo_linked = -1; /* Some flags in Blo static gint hf_s7comm_userdata_blockinfo_standard_block = -1; static gint hf_s7comm_userdata_blockinfo_nonretain = -1; /* Some flags in Block info response */ static gint ett_s7comm_userdata_blockinfo_flags = -1; -static const int *s7comm_userdata_blockinfo_flags_fields[] = { +static int * const s7comm_userdata_blockinfo_flags_fields[] = { &hf_s7comm_userdata_blockinfo_linked, &hf_s7comm_userdata_blockinfo_standard_block, &hf_s7comm_userdata_blockinfo_nonretain, @@ -1419,7 +1419,7 @@ static gint hf_s7comm_diagdata_registerflag_ar2 = -1; /* Addressregister 2 static gint hf_s7comm_diagdata_registerflag_db1 = -1; /* Datablock register 1 */ static gint hf_s7comm_diagdata_registerflag_db2 = -1; /* Datablock register 2 */ static gint ett_s7comm_diagdata_registerflag = -1; -static const int *s7comm_diagdata_registerflag_fields[] = { +static int * const s7comm_diagdata_registerflag_fields[] = { &hf_s7comm_diagdata_registerflag_stw, &hf_s7comm_diagdata_registerflag_accu1, &hf_s7comm_diagdata_registerflag_accu2, @@ -1683,7 +1683,7 @@ static gint hf_s7comm_data_blockcontrol_functionstatus = -1; static gint hf_s7comm_data_blockcontrol_functionstatus_more = -1; static gint hf_s7comm_data_blockcontrol_functionstatus_error = -1; static gint ett_s7comm_data_blockcontrol_status = -1; -static const int *s7comm_data_blockcontrol_status_fields[] = { +static int * const s7comm_data_blockcontrol_status_fields[] = { &hf_s7comm_data_blockcontrol_functionstatus_more, &hf_s7comm_data_blockcontrol_functionstatus_error, NULL @@ -1756,7 +1756,7 @@ static gint hf_s7comm_cpu_alarm_message_signal_sig6 = -1; static gint hf_s7comm_cpu_alarm_message_signal_sig7 = -1; static gint hf_s7comm_cpu_alarm_message_signal_sig8 = -1; static gint ett_s7comm_cpu_alarm_message_signal = -1; -static const int *s7comm_cpu_alarm_message_signal_fields[] = { +static int * const s7comm_cpu_alarm_message_signal_fields[] = { &hf_s7comm_cpu_alarm_message_signal_sig1, &hf_s7comm_cpu_alarm_message_signal_sig2, &hf_s7comm_cpu_alarm_message_signal_sig3, @@ -1792,7 +1792,7 @@ static gint hf_s7comm_cpu_diag_msg_info1 = -1; static gint hf_s7comm_cpu_diag_msg_info2 = -1; static gint ett_s7comm_cpu_diag_msg_eventid = -1; -static const int *s7comm_cpu_diag_msg_eventid_fields[] = { +static int * const s7comm_cpu_diag_msg_eventid_fields[] = { &hf_s7comm_cpu_diag_msg_eventid_class, &hf_s7comm_cpu_diag_msg_eventid_ident_entleave, &hf_s7comm_cpu_diag_msg_eventid_ident_diagbuf, @@ -2414,7 +2414,7 @@ static gint hf_s7comm_cpu_msgservice_subscribe_events_system = -1; static gint hf_s7comm_cpu_msgservice_subscribe_events_userdefined = -1; static gint hf_s7comm_cpu_msgservice_subscribe_events_alarms = -1; static gint ett_s7comm_cpu_msgservice_subscribe_events = -1; -static const int *s7comm_cpu_msgservice_subscribe_events_fields[] = { +static int * const s7comm_cpu_msgservice_subscribe_events_fields[] = { &hf_s7comm_cpu_msgservice_subscribe_events_modetrans, &hf_s7comm_cpu_msgservice_subscribe_events_system, &hf_s7comm_cpu_msgservice_subscribe_events_userdefined, diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 5c6ec1b9cd..46596d5a38 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -34,7 +34,7 @@ static gint hf_s7comm_userdata_szl_id_partlist_num = -1; static gint hf_s7comm_userdata_szl_id_partlist_len = -1; static gint hf_s7comm_userdata_szl_id_partlist_cnt = -1; static gint ett_s7comm_userdata_szl_id = -1; -static const int *s7comm_userdata_szl_id_fields[] = { +static int * const s7comm_userdata_szl_id_fields[] = { &hf_s7comm_userdata_szl_id_type, &hf_s7comm_userdata_szl_id_partlist_ex, &hf_s7comm_userdata_szl_id_partlist_num, @@ -545,7 +545,7 @@ static gint hf_s7comm_szl_xy22_00xx_al2_3 = -1; static gint hf_s7comm_szl_xy22_00xx_al3 = -1; static gint ett_s7comm_szl_xy22_00xx_al1 = -1; -static const int *s7comm_szl_xy22_00xx_al1_fields[] = { +static int * const s7comm_szl_xy22_00xx_al1_fields[] = { &hf_s7comm_szl_xy22_00xx_al1_0, &hf_s7comm_szl_xy22_00xx_al1_1, &hf_s7comm_szl_xy22_00xx_al1_2, @@ -555,7 +555,7 @@ static const int *s7comm_szl_xy22_00xx_al1_fields[] = { NULL }; static gint ett_s7comm_szl_xy22_00xx_al2 = -1; -static const int *s7comm_szl_xy22_00xx_al2_fields[] = { +static int * const s7comm_szl_xy22_00xx_al2_fields[] = { &hf_s7comm_szl_xy22_00xx_al2_0, &hf_s7comm_szl_xy22_00xx_al2_1, &hf_s7comm_szl_xy22_00xx_al2_2, @@ -634,7 +634,7 @@ static gint hf_s7comm_szl_0131_0002_time = -1; static gint hf_s7comm_szl_0131_0002_res = -1; static gint ett_s7comm_szl_0131_0002_funkt_0 = -1; -static const int *s7comm_szl_0131_0002_funkt_0_fields[] = { +static int * const s7comm_szl_0131_0002_funkt_0_fields[] = { &hf_s7comm_szl_0131_0002_funkt_0_0, &hf_s7comm_szl_0131_0002_funkt_0_1, &hf_s7comm_szl_0131_0002_funkt_0_2, @@ -646,7 +646,7 @@ static const int *s7comm_szl_0131_0002_funkt_0_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0002_funkt_1 = -1; -static const int *s7comm_szl_0131_0002_funkt_1_fields[] = { +static int * const s7comm_szl_0131_0002_funkt_1_fields[] = { &hf_s7comm_szl_0131_0002_funkt_1_0, &hf_s7comm_szl_0131_0002_funkt_1_1, &hf_s7comm_szl_0131_0002_funkt_1_2, @@ -658,7 +658,7 @@ static const int *s7comm_szl_0131_0002_funkt_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0002_funkt_2 = -1; -static const int *s7comm_szl_0131_0002_funkt_2_fields[] = { +static int * const s7comm_szl_0131_0002_funkt_2_fields[] = { &hf_s7comm_szl_0131_0002_funkt_2_0, &hf_s7comm_szl_0131_0002_funkt_2_1, &hf_s7comm_szl_0131_0002_funkt_2_2, @@ -670,7 +670,7 @@ static const int *s7comm_szl_0131_0002_funkt_2_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0002_trgereig_0 = -1; -static const int *s7comm_szl_0131_0002_trgereig_0_fields[] = { +static int * const s7comm_szl_0131_0002_trgereig_0_fields[] = { &hf_s7comm_szl_0131_0002_trgereig_0_0, &hf_s7comm_szl_0131_0002_trgereig_0_1, &hf_s7comm_szl_0131_0002_trgereig_0_2, @@ -682,7 +682,7 @@ static const int *s7comm_szl_0131_0002_trgereig_0_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0002_trgereig_1 = -1; -static const int *s7comm_szl_0131_0002_trgereig_1_fields[] = { +static int * const s7comm_szl_0131_0002_trgereig_1_fields[] = { &hf_s7comm_szl_0131_0002_trgereig_1_0, &hf_s7comm_szl_0131_0002_trgereig_1_1, &hf_s7comm_szl_0131_0002_trgereig_1_2, @@ -738,7 +738,7 @@ static gint hf_s7comm_szl_0131_0003_per_max = -1; static gint hf_s7comm_szl_0131_0003_res = -1; static gint ett_s7comm_szl_0131_0003_funkt_0 = -1; -static const int *s7comm_szl_0131_0003_funkt_0_fields[] = { +static int * const s7comm_szl_0131_0003_funkt_0_fields[] = { &hf_s7comm_szl_0131_0003_funkt_0_0, &hf_s7comm_szl_0131_0003_funkt_0_1, &hf_s7comm_szl_0131_0003_funkt_0_2, @@ -750,7 +750,7 @@ static const int *s7comm_szl_0131_0003_funkt_0_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0003_funkt_1 = -1; -static const int *s7comm_szl_0131_0003_funkt_1_fields[] = { +static int * const s7comm_szl_0131_0003_funkt_1_fields[] = { &hf_s7comm_szl_0131_0003_funkt_1_0, &hf_s7comm_szl_0131_0003_funkt_1_1, &hf_s7comm_szl_0131_0003_funkt_1_2, @@ -762,7 +762,7 @@ static const int *s7comm_szl_0131_0003_funkt_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0003_funkt_2 = -1; -static const int *s7comm_szl_0131_0003_funkt_2_fields[] = { +static int * const s7comm_szl_0131_0003_funkt_2_fields[] = { &hf_s7comm_szl_0131_0003_funkt_2_0, &hf_s7comm_szl_0131_0003_funkt_2_1, &hf_s7comm_szl_0131_0003_funkt_2_2, @@ -774,7 +774,7 @@ static const int *s7comm_szl_0131_0003_funkt_2_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0003_funkt_3 = -1; -static const int *s7comm_szl_0131_0003_funkt_3_fields[] = { +static int * const s7comm_szl_0131_0003_funkt_3_fields[] = { &hf_s7comm_szl_0131_0003_funkt_3_0, &hf_s7comm_szl_0131_0003_funkt_3_1, &hf_s7comm_szl_0131_0003_funkt_3_2, @@ -843,7 +843,7 @@ static gint hf_s7comm_szl_0131_0004_ver = -1; static gint hf_s7comm_szl_0131_0004_res = -1; static gint ett_s7comm_szl_0131_0004_funkt_0 = -1; -static const int *s7comm_szl_0131_0004_funkt_0_fields[] = { +static int * const s7comm_szl_0131_0004_funkt_0_fields[] = { &hf_s7comm_szl_0131_0004_funkt_0_0, &hf_s7comm_szl_0131_0004_funkt_0_1, &hf_s7comm_szl_0131_0004_funkt_0_2, @@ -855,7 +855,7 @@ static const int *s7comm_szl_0131_0004_funkt_0_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0004_funkt_1 = -1; -static const int *s7comm_szl_0131_0004_funkt_1_fields[] = { +static int * const s7comm_szl_0131_0004_funkt_1_fields[] = { &hf_s7comm_szl_0131_0004_funkt_1_0, &hf_s7comm_szl_0131_0004_funkt_1_1, &hf_s7comm_szl_0131_0004_funkt_1_2, @@ -867,7 +867,7 @@ static const int *s7comm_szl_0131_0004_funkt_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0004_funkt_2 = -1; -static const int *s7comm_szl_0131_0004_funkt_2_fields[] = { +static int * const s7comm_szl_0131_0004_funkt_2_fields[] = { &hf_s7comm_szl_0131_0004_funkt_2_0, &hf_s7comm_szl_0131_0004_funkt_2_1, &hf_s7comm_szl_0131_0004_funkt_2_2, @@ -879,7 +879,7 @@ static const int *s7comm_szl_0131_0004_funkt_2_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0004_funkt_3 = -1; -static const int *s7comm_szl_0131_0004_funkt_3_fields[] = { +static int * const s7comm_szl_0131_0004_funkt_3_fields[] = { &hf_s7comm_szl_0131_0004_funkt_3_0, &hf_s7comm_szl_0131_0004_funkt_3_1, &hf_s7comm_szl_0131_0004_funkt_3_2, @@ -891,7 +891,7 @@ static const int *s7comm_szl_0131_0004_funkt_3_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0004_funkt_4 = -1; -static const int *s7comm_szl_0131_0004_funkt_4_fields[] = { +static int * const s7comm_szl_0131_0004_funkt_4_fields[] = { &hf_s7comm_szl_0131_0004_funkt_4_0, &hf_s7comm_szl_0131_0004_funkt_4_1, &hf_s7comm_szl_0131_0004_funkt_4_2, @@ -926,7 +926,7 @@ static gint hf_s7comm_szl_0131_0005_anz_mel = -1; static gint hf_s7comm_szl_0131_0005_res = -1; static gint ett_s7comm_szl_0131_0005_funkt_0 = -1; -static const int *s7comm_szl_0131_0005_funkt_0_fields[] = { +static int * const s7comm_szl_0131_0005_funkt_0_fields[] = { &hf_s7comm_szl_0131_0005_funkt_0_0, &hf_s7comm_szl_0131_0005_funkt_0_1, &hf_s7comm_szl_0131_0005_funkt_0_2, @@ -1062,7 +1062,7 @@ static gint hf_s7comm_szl_0131_0006_verb_prog = -1; static gint hf_s7comm_szl_0131_0006_res3 = -1; static gint ett_s7comm_szl_0131_0006_funkt_0 = -1; -static const int *s7comm_szl_0131_0006_funkt_0_fields[] = { +static int * const s7comm_szl_0131_0006_funkt_0_fields[] = { &hf_s7comm_szl_0131_0006_funkt_0_0, &hf_s7comm_szl_0131_0006_funkt_0_1, &hf_s7comm_szl_0131_0006_funkt_0_2, @@ -1074,7 +1074,7 @@ static const int *s7comm_szl_0131_0006_funkt_0_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_funkt_1 = -1; -static const int *s7comm_szl_0131_0006_funkt_1_fields[] = { +static int * const s7comm_szl_0131_0006_funkt_1_fields[] = { &hf_s7comm_szl_0131_0006_funkt_1_0, &hf_s7comm_szl_0131_0006_funkt_1_1, &hf_s7comm_szl_0131_0006_funkt_1_2, @@ -1086,7 +1086,7 @@ static const int *s7comm_szl_0131_0006_funkt_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_funkt_2 = -1; -static const int *s7comm_szl_0131_0006_funkt_2_fields[] = { +static int * const s7comm_szl_0131_0006_funkt_2_fields[] = { &hf_s7comm_szl_0131_0006_funkt_2_0, &hf_s7comm_szl_0131_0006_funkt_2_1, &hf_s7comm_szl_0131_0006_funkt_2_2, @@ -1098,7 +1098,7 @@ static const int *s7comm_szl_0131_0006_funkt_2_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_funkt_3 = -1; -static const int *s7comm_szl_0131_0006_funkt_3_fields[] = { +static int * const s7comm_szl_0131_0006_funkt_3_fields[] = { &hf_s7comm_szl_0131_0006_funkt_3_0, &hf_s7comm_szl_0131_0006_funkt_3_1, &hf_s7comm_szl_0131_0006_funkt_3_2, @@ -1110,7 +1110,7 @@ static const int *s7comm_szl_0131_0006_funkt_3_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_funkt_6 = -1; -static const int *s7comm_szl_0131_0006_funkt_6_fields[] = { +static int * const s7comm_szl_0131_0006_funkt_6_fields[] = { &hf_s7comm_szl_0131_0006_funkt_6_0, &hf_s7comm_szl_0131_0006_funkt_6_1, &hf_s7comm_szl_0131_0006_funkt_6_2, @@ -1122,7 +1122,7 @@ static const int *s7comm_szl_0131_0006_funkt_6_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_funkt_7 = -1; -static const int *s7comm_szl_0131_0006_funkt_7_fields[] = { +static int * const s7comm_szl_0131_0006_funkt_7_fields[] = { &hf_s7comm_szl_0131_0006_funkt_7_0, &hf_s7comm_szl_0131_0006_funkt_7_1, &hf_s7comm_szl_0131_0006_funkt_7_2, @@ -1134,7 +1134,7 @@ static const int *s7comm_szl_0131_0006_funkt_7_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_zugtyp_0 = -1; -static const int *s7comm_szl_0131_0006_zugtyp_0_fields[] = { +static int * const s7comm_szl_0131_0006_zugtyp_0_fields[] = { &hf_s7comm_szl_0131_0006_zugtyp_0_0, &hf_s7comm_szl_0131_0006_zugtyp_0_1, &hf_s7comm_szl_0131_0006_zugtyp_0_2, @@ -1146,7 +1146,7 @@ static const int *s7comm_szl_0131_0006_zugtyp_0_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_zugtyp_1 = -1; -static const int *s7comm_szl_0131_0006_zugtyp_1_fields[] = { +static int * const s7comm_szl_0131_0006_zugtyp_1_fields[] = { &hf_s7comm_szl_0131_0006_zugtyp_1_0, &hf_s7comm_szl_0131_0006_zugtyp_1_1, &hf_s7comm_szl_0131_0006_zugtyp_1_2, @@ -1158,7 +1158,7 @@ static const int *s7comm_szl_0131_0006_zugtyp_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_zugtyp_2 = -1; -static const int *s7comm_szl_0131_0006_zugtyp_2_fields[] = { +static int * const s7comm_szl_0131_0006_zugtyp_2_fields[] = { &hf_s7comm_szl_0131_0006_zugtyp_2_0, &hf_s7comm_szl_0131_0006_zugtyp_2_1, &hf_s7comm_szl_0131_0006_zugtyp_2_2, @@ -1170,7 +1170,7 @@ static const int *s7comm_szl_0131_0006_zugtyp_2_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_zugtyp_3 = -1; -static const int *s7comm_szl_0131_0006_zugtyp_3_fields[] = { +static int * const s7comm_szl_0131_0006_zugtyp_3_fields[] = { &hf_s7comm_szl_0131_0006_zugtyp_3_0, &hf_s7comm_szl_0131_0006_zugtyp_3_1, &hf_s7comm_szl_0131_0006_zugtyp_3_2, @@ -1182,7 +1182,7 @@ static const int *s7comm_szl_0131_0006_zugtyp_3_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_zugtyp_6 = -1; -static const int *s7comm_szl_0131_0006_zugtyp_6_fields[] = { +static int * const s7comm_szl_0131_0006_zugtyp_6_fields[] = { &hf_s7comm_szl_0131_0006_zugtyp_6_0, &hf_s7comm_szl_0131_0006_zugtyp_6_1, &hf_s7comm_szl_0131_0006_zugtyp_6_2, @@ -1194,7 +1194,7 @@ static const int *s7comm_szl_0131_0006_zugtyp_6_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0006_zugtyp_7 = -1; -static const int *s7comm_szl_0131_0006_zugtyp_7_fields[] = { +static int * const s7comm_szl_0131_0006_zugtyp_7_fields[] = { &hf_s7comm_szl_0131_0006_zugtyp_7_0, &hf_s7comm_szl_0131_0006_zugtyp_7_1, &hf_s7comm_szl_0131_0006_zugtyp_7_2, @@ -1247,7 +1247,7 @@ static gint hf_s7comm_szl_0131_0007_len_3 = -1; static gint hf_s7comm_szl_0131_0007_res = -1; static gint ett_s7comm_szl_0131_0007_funkt_0 = -1; -static const int *s7comm_szl_0131_0007_funkt_0_fields[] = { +static int * const s7comm_szl_0131_0007_funkt_0_fields[] = { &hf_s7comm_szl_0131_0007_funkt_0_0, &hf_s7comm_szl_0131_0007_funkt_0_1, &hf_s7comm_szl_0131_0007_funkt_0_2, @@ -1260,7 +1260,7 @@ static const int *s7comm_szl_0131_0007_funkt_0_fields[] = { }; static gint ett_s7comm_szl_0131_0007_obj_0 = -1; -static const int *s7comm_szl_0131_0007_obj_0_fields[] = { +static int * const s7comm_szl_0131_0007_obj_0_fields[] = { &hf_s7comm_szl_0131_0007_obj_0_0, &hf_s7comm_szl_0131_0007_obj_0_1, &hf_s7comm_szl_0131_0007_obj_0_2, @@ -1273,7 +1273,7 @@ static const int *s7comm_szl_0131_0007_obj_0_fields[] = { }; static gint ett_s7comm_szl_0131_0007_mode = -1; -static const int *s7comm_szl_0131_0007_mode_fields[] = { +static int * const s7comm_szl_0131_0007_mode_fields[] = { &hf_s7comm_szl_0131_0007_mode_0, &hf_s7comm_szl_0131_0007_mode_1, NULL @@ -1351,7 +1351,7 @@ static gint hf_s7comm_szl_0131_0009_anz_bsz = -1; static gint hf_s7comm_szl_0131_0009_res2 = -1; static gint ett_s7comm_szl_0131_0009_sync_k = -1; -static const int *s7comm_szl_0131_0009_sync_k_fields[] = { +static int * const s7comm_szl_0131_0009_sync_k_fields[] = { &hf_s7comm_szl_0131_0009_sync_k_0, &hf_s7comm_szl_0131_0009_sync_k_1, &hf_s7comm_szl_0131_0009_sync_k_2, @@ -1359,7 +1359,7 @@ static const int *s7comm_szl_0131_0009_sync_k_fields[] = { }; static gint ett_s7comm_szl_0131_0009_sync_mpi = -1; -static const int *s7comm_szl_0131_0009_sync_mpi_fields[] = { +static int * const s7comm_szl_0131_0009_sync_mpi_fields[] = { &hf_s7comm_szl_0131_0009_sync_mpi_0, &hf_s7comm_szl_0131_0009_sync_mpi_1, &hf_s7comm_szl_0131_0009_sync_mpi_2, @@ -1367,7 +1367,7 @@ static const int *s7comm_szl_0131_0009_sync_mpi_fields[] = { }; static gint ett_s7comm_szl_0131_0009_sync_mfi = -1; -static const int *s7comm_szl_0131_0009_sync_mfi_fields[] = { +static int * const s7comm_szl_0131_0009_sync_mfi_fields[] = { &hf_s7comm_szl_0131_0009_sync_mfi_0, &hf_s7comm_szl_0131_0009_sync_mfi_1, &hf_s7comm_szl_0131_0009_sync_mfi_2, @@ -1419,7 +1419,7 @@ static gint hf_s7comm_szl_0131_0010_maxanz_arch = -1; static gint hf_s7comm_szl_0131_0010_res = -1; static gint ett_s7comm_szl_0131_0010_funk_1 = -1; -static const int *s7comm_szl_0131_0010_funk_1_fields[] = { +static int * const s7comm_szl_0131_0010_funk_1_fields[] = { &hf_s7comm_szl_0131_0010_funk_1_0, &hf_s7comm_szl_0131_0010_funk_1_1, &hf_s7comm_szl_0131_0010_funk_1_2, @@ -1431,7 +1431,7 @@ static const int *s7comm_szl_0131_0010_funk_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0010_ber_meld_1 = -1; -static const int *s7comm_szl_0131_0010_ber_meld_1_fields[] = { +static int * const s7comm_szl_0131_0010_ber_meld_1_fields[] = { &hf_s7comm_szl_0131_0010_ber_meld_1_0, &hf_s7comm_szl_0131_0010_ber_meld_1_1, &hf_s7comm_szl_0131_0010_ber_meld_1_2, @@ -1443,7 +1443,7 @@ static const int *s7comm_szl_0131_0010_ber_meld_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0010_ber_zus_1 = -1; -static const int *s7comm_szl_0131_0010_ber_zus_1_fields[] = { +static int * const s7comm_szl_0131_0010_ber_zus_1_fields[] = { &hf_s7comm_szl_0131_0010_ber_zus_1_0, &hf_s7comm_szl_0131_0010_ber_zus_1_1, &hf_s7comm_szl_0131_0010_ber_zus_1_2, @@ -1455,7 +1455,7 @@ static const int *s7comm_szl_0131_0010_ber_zus_1_fields[] = { NULL }; static gint ett_s7comm_szl_0131_0010_typ_zus_1 = -1; -static const int *s7comm_szl_0131_0010_typ_zus_1_fields[] = { +static int * const s7comm_szl_0131_0010_typ_zus_1_fields[] = { &hf_s7comm_szl_0131_0010_typ_zus_1_0, &hf_s7comm_szl_0131_0010_typ_zus_1_1, &hf_s7comm_szl_0131_0010_typ_zus_1_2, @@ -1641,7 +1641,7 @@ static const value_string szl_0091_0000_berbgbr_areaid_names[] = { { 0, NULL } }; static gint ett_s7comm_szl_0091_0000_eastat = -1; -static const int *s7comm_szl_0091_0000_eastat_fields[] = { +static int * const s7comm_szl_0091_0000_eastat_fields[] = { &hf_s7comm_szl_0091_0000_eastat_0, &hf_s7comm_szl_0091_0000_eastat_1, &hf_s7comm_szl_0091_0000_eastat_2, @@ -1654,7 +1654,7 @@ static const int *s7comm_szl_0091_0000_eastat_fields[] = { NULL }; static gint ett_s7comm_szl_0091_0000_berbgbr = -1; -static const int *s7comm_szl_0091_0000_berbgbr_fields[] = { +static int * const s7comm_szl_0091_0000_berbgbr_fields[] = { &hf_s7comm_szl_0091_0000_berbgbr_0_2, &hf_s7comm_szl_0091_0000_berbgbr_3, &hf_s7comm_szl_0091_0000_berbgbr_areaid, @@ -1718,7 +1718,7 @@ static gint hf_s7comm_szl_0096_xxxx_eastat_7 = -1; static gint hf_s7comm_szl_0096_xxxx_eastat_8 = -1; static gint hf_s7comm_szl_0096_xxxx_eastat_9 = -1; static gint ett_s7comm_szl_0096_xxxx_eastat = -1; -static const int *s7comm_szl_0096_xxxx_eastat_fields[] = { +static int * const s7comm_szl_0096_xxxx_eastat_fields[] = { &hf_s7comm_szl_0096_xxxx_eastat_0, &hf_s7comm_szl_0096_xxxx_eastat_1, &hf_s7comm_szl_0096_xxxx_eastat_2, @@ -1737,7 +1737,7 @@ static gint hf_s7comm_szl_0096_xxxx_berbgbr_3 = -1; static gint hf_s7comm_szl_0096_xxxx_berbgbr_areaid = -1; static gint hf_s7comm_szl_0096_xxxx_berbgbr_7 = -1; static gint ett_s7comm_szl_0096_xxxx_berbgbr = -1; -static const int *s7comm_szl_0096_xxxx_berbgbr_fields[] = { +static int * const s7comm_szl_0096_xxxx_berbgbr_fields[] = { &hf_s7comm_szl_0096_xxxx_berbgbr_0_2, &hf_s7comm_szl_0096_xxxx_berbgbr_3, &hf_s7comm_szl_0096_xxxx_berbgbr_areaid, @@ -1764,7 +1764,7 @@ static const value_string szl_0424_0000_bzu_id_names[] = { { 0, NULL } }; static gint ett_s7comm_szl_0424_0000_bzu_id = -1; -static const int *s7comm_szl_0424_0000_bzu_id_fields[] = { +static int * const s7comm_szl_0424_0000_bzu_id_fields[] = { &hf_s7comm_szl_0424_0000_bzu_id_req, &hf_s7comm_szl_0424_0000_bzu_id_pre, NULL diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 53d6443e3e..602a7d139e 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -817,7 +817,7 @@ static void dissect_setlbstate_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 { guint8 LB_uid_len; - static const int *lbflags[] = { + static int * const lbflags[] = { &hf_sasp_pushflag, &hf_sasp_trustflag, &hf_sasp_nochangeflag, @@ -946,7 +946,7 @@ static guint32 dissect_weight_entry_data_comp(tvbuff_t *tvb, proto_tree *pay_loa { proto_tree *weight_entry_data_comp_tree; - static const int *wtflags[] = { + static int * const wtflags[] = { &hf_sasp_wed_contactsuccess_flag, &hf_sasp_wed_quiesce_flag, &hf_sasp_wed_registration_flag, diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c index 43a7851c42..1863b9167a 100644 --- a/epan/dissectors/packet-scsi-mmc.c +++ b/epan/dissectors/packet-scsi-mmc.c @@ -672,13 +672,13 @@ dissect_mmc4_readdiscinformation (tvbuff_t *tvb_a, packet_info *pinfo _U_, proto ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if (!isreq) { - static const int *disk_fields[] = { + static int * const disk_fields[] = { &hf_scsi_mmc_disc_info_erasable, &hf_scsi_mmc_disc_info_state_of_last_session, &hf_scsi_mmc_disc_info_disk_status, NULL }; - static const int *format_fields[] = { + static int * const format_fields[] = { &hf_scsi_mmc_disc_info_did_v, &hf_scsi_mmc_disc_info_dbc_v, &hf_scsi_mmc_disc_info_uru, @@ -980,13 +980,13 @@ dissect_mmc4_readtrackinformation (tvbuff_t *tvb_a, packet_info *pinfo _U_, prot ett_scsi_control, cdb_control_fields, ENC_BIG_ENDIAN); } if (!isreq) { - static const int *track_fields[] = { + static int * const track_fields[] = { &hf_scsi_mmc_rti_damage, &hf_scsi_mmc_rti_copy, &hf_scsi_mmc_rti_track_mode, NULL }; - static const int *data_fields[] = { + static int * const data_fields[] = { &hf_scsi_mmc_rti_rt, &hf_scsi_mmc_rti_blank, &hf_scsi_mmc_rti_packet, @@ -1045,7 +1045,7 @@ dissect_mmc4_geteventstatusnotification (tvbuff_t *tvb, packet_info *pinfo _U_, { if (tree && isreq && iscdb) { - static const int *notification_fields[] = { + static int * const notification_fields[] = { &hf_scsi_mmc_gesn_device_busy, &hf_scsi_mmc_gesn_multi_initiator, &hf_scsi_mmc_gesn_media, @@ -1228,7 +1228,7 @@ dissect_mmc_preventallowmediaremoval(tvbuff_t *tvb, packet_info *pinfo, proto_tr { if (isreq && iscdb) { guint8 flags; - static const int *prevent_allow_fields[] = { + static int * const prevent_allow_fields[] = { &hf_scsi_mmc_prevent_allow_persistent, &hf_scsi_mmc_prevent_allow_prevent, NULL diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 6ab00272b4..b34c3e3a78 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -180,7 +180,7 @@ dissect_sbc_formatunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *fuflags_fields[] = { + static int * const fuflags_fields[] = { &hf_scsi_sbc_fuflags_fmtpinfo, &hf_scsi_sbc_fuflags_rto_req, &hf_scsi_sbc_fuflags_longlist, @@ -248,7 +248,7 @@ dissect_sbc_prefetch10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *prefetch_fields[] = { + static int * const prefetch_fields[] = { &hf_scsi_sbc_prefetch_immed, NULL }; @@ -276,7 +276,7 @@ dissect_sbc_synchronizecache10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *sync_fields[] = { + static int * const sync_fields[] = { &hf_scsi_sbc_synccache_sync_nv, &hf_scsi_sbc_synccache_immed, NULL @@ -305,7 +305,7 @@ dissect_sbc_synchronizecache16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *sync_fields[] = { + static int * const sync_fields[] = { &hf_scsi_sbc_synccache_sync_nv, &hf_scsi_sbc_synccache_immed, NULL @@ -334,7 +334,7 @@ dissect_sbc_prefetch16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *prefetch_fields[] = { + static int * const prefetch_fields[] = { &hf_scsi_sbc_prefetch_immed, NULL }; @@ -362,7 +362,7 @@ dissect_sbc_read10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr10_fields[] = { + static int * const rdwr10_fields[] = { &hf_scsi_sbc_rdprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -393,7 +393,7 @@ dissect_sbc_xdread10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *xdread10_fields[] = { + static int * const xdread10_fields[] = { &hf_scsi_sbc_xorpinfo, NULL }; @@ -421,7 +421,7 @@ dissect_sbc_xdwrite10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *xdwrite10_fields[] = { + static int * const xdwrite10_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -453,7 +453,7 @@ dissect_sbc_xdwriteread10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *xdwriteread10_fields[] = { + static int * const xdwriteread10_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -486,7 +486,7 @@ dissect_sbc_xpwrite10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *xpwrite10_fields[] = { + static int * const xpwrite10_fields[] = { &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, &hf_scsi_sbc_fua_nv, @@ -517,7 +517,7 @@ dissect_sbc_write10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr10_fields[] = { + static int * const rdwr10_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -547,7 +547,7 @@ dissect_sbc_read12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr12_fields[] = { + static int * const rdwr12_fields[] = { &hf_scsi_sbc_rdprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -577,7 +577,7 @@ dissect_sbc_write12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr12_fields[] = { + static int * const rdwr12_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -607,7 +607,7 @@ dissect_sbc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr16_fields[] = { + static int * const rdwr16_fields[] = { &hf_scsi_sbc_rdprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -636,7 +636,7 @@ dissect_sbc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr16_fields[] = { + static int * const rdwr16_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -666,7 +666,7 @@ dissect_sbc_writeatomic16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr16_fields[] = { + static int * const rdwr16_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -695,7 +695,7 @@ dissect_sbc_orwrite (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr16_fields[] = { + static int * const rdwr16_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -725,7 +725,7 @@ dissect_sbc_comparenwrite (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rdwr16_fields[] = { + static int * const rdwr16_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_fua, @@ -785,11 +785,11 @@ dissect_sbc_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr guint offset, gboolean isreq _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *ssu_fields[] = { + static int * const ssu_fields[] = { &hf_scsi_sbc_ssu_immed, NULL }; - static const int *pwr_fields[] = { + static int * const pwr_fields[] = { &hf_scsi_sbc_ssu_pwr_cond, &hf_scsi_sbc_ssu_loej, &hf_scsi_sbc_ssu_start, @@ -815,7 +815,7 @@ dissect_sbc_verify10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *verify10_fields[] = { + static int * const verify10_fields[] = { &hf_scsi_sbc_vrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_bytchk, @@ -845,7 +845,7 @@ dissect_sbc_verify12 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *verify12_fields[] = { + static int * const verify12_fields[] = { &hf_scsi_sbc_vrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_bytchk, @@ -875,7 +875,7 @@ dissect_sbc_verify16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *verify16_fields[] = { + static int * const verify16_fields[] = { &hf_scsi_sbc_vrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_bytchk, @@ -907,7 +907,7 @@ dissect_sbc_wrverify10 (tvbuff_t *tvb, packet_info *pinfo _U_, scsi_task_data_t *cdata _U_) { - static const int *wrverify10_fields[] = { + static int * const wrverify10_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_bytchk, @@ -937,7 +937,7 @@ dissect_sbc_wrverify12 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *wrverify12_fields[] = { + static int * const wrverify12_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_bytchk, @@ -967,7 +967,7 @@ dissect_sbc_wrverify16 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *wrverify16_fields[] = { + static int * const wrverify16_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_dpo, &hf_scsi_sbc_bytchk, @@ -1026,7 +1026,7 @@ dissect_sbc_readdefectdata10 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *defect_fields[] = { + static int * const defect_fields[] = { &hf_scsi_sbc_defect_list_format, &hf_scsi_sbc_req_plist, &hf_scsi_sbc_req_glist, @@ -1053,7 +1053,7 @@ dissect_sbc_readlong10 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *corrct_fields[] = { + static int * const corrct_fields[] = { &hf_scsi_sbc_corrct, NULL }; @@ -1094,7 +1094,7 @@ dissect_sbc_writesame10 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *writesame10_fields[] = { + static int * const writesame10_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_anchor, &hf_scsi_sbc_unmap, @@ -1123,7 +1123,7 @@ dissect_sbc_writesame16 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *writesame16_fields[] = { + static int * const writesame16_fields[] = { &hf_scsi_sbc_wrprotect, &hf_scsi_sbc_anchor, &hf_scsi_sbc_unmap, @@ -1152,7 +1152,7 @@ dissect_sbc_unmap (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *unmap_fields[] = { + static int * const unmap_fields[] = { &hf_scsi_sbc_unmap_anchor, NULL }; @@ -1212,13 +1212,13 @@ dissect_sbc_sanitize (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *sanitize_fields[] = { + static int * const sanitize_fields[] = { &hf_scsi_sbc_sanitize_immed, &hf_scsi_sbc_sanitize_ause, &hf_scsi_sbc_sanitize_sa, NULL }; - static const int *sanitize_overwrite_fields[] = { + static int * const sanitize_overwrite_fields[] = { &hf_scsi_sbc_sanitize_invert, &hf_scsi_sbc_sanitize_test, &hf_scsi_sbc_sanitize_owcount, @@ -1266,7 +1266,7 @@ dissect_sbc_readdefectdata12 (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *defect_fields[] = { + static int * const defect_fields[] = { &hf_scsi_sbc_defect_list_format, &hf_scsi_sbc_req_plist, &hf_scsi_sbc_req_glist, @@ -1293,7 +1293,7 @@ dissect_sbc_reassignblocks (tvbuff_t *tvb, packet_info *pinfo _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *reassign_fields[] = { + static int * const reassign_fields[] = { &hf_scsi_sbc_reassignblocks_longlba, &hf_scsi_sbc_reassignblocks_longlist, NULL diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 12d5e00079..6924827ade 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -90,7 +90,7 @@ dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *exchg_fields[] = { + static int * const exchg_fields[] = { &hf_scsi_smc_inv1, &hf_scsi_smc_inv2, NULL @@ -116,7 +116,7 @@ dissect_smc_position_to_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *pte_fields[] = { + static int * const pte_fields[] = { &hf_scsi_smc_invert, NULL }; @@ -153,7 +153,7 @@ dissect_smc_initialize_element_status_with_range (tvbuff_t *tvb, packet_info *pi guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *range_fields[] = { + static int * const range_fields[] = { &hf_scsi_smc_fast, &hf_scsi_smc_range, NULL @@ -192,7 +192,7 @@ dissect_smc_movemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *move_fields[] = { + static int * const move_fields[] = { &hf_scsi_smc_invert, NULL }; diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index e12d78912a..77c3b1b601 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -114,7 +114,7 @@ dissect_ssc_read6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *read6_fields[] = { + static int * const read6_fields[] = { &hf_scsi_ssc_sili, &hf_scsi_ssc_fixed, NULL @@ -139,7 +139,7 @@ dissect_ssc_recoverbuffereddata (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *recover_fields[] = { + static int * const recover_fields[] = { &hf_scsi_ssc_sili, &hf_scsi_ssc_fixed, NULL @@ -164,7 +164,7 @@ dissect_ssc_reportdensitysupport (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rd_fields[] = { + static int * const rd_fields[] = { &hf_scsi_ssc_medium_type, &hf_scsi_ssc_media, NULL @@ -194,7 +194,7 @@ dissect_ssc_readreverse6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rr6_fields[] = { + static int * const rr6_fields[] = { &hf_scsi_ssc_bytord, &hf_scsi_ssc_sili, &hf_scsi_ssc_fixed, @@ -220,7 +220,7 @@ dissect_ssc_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *read6_fields[] = { + static int * const read6_fields[] = { &hf_scsi_ssc_sili, &hf_scsi_ssc_fixed, NULL @@ -247,7 +247,7 @@ dissect_ssc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *write16_fields[] = { + static int * const write16_fields[] = { &hf_scsi_ssc_fcs, &hf_scsi_ssc_lcs, &hf_scsi_ssc_fixed, @@ -275,7 +275,7 @@ dissect_ssc_writefilemarks16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *wf16_fields[] = { + static int * const wf16_fields[] = { &hf_scsi_ssc_fcs, &hf_scsi_ssc_lcs, &hf_scsi_ssc_immed, @@ -303,7 +303,7 @@ dissect_ssc_verify16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *verify16_fields[] = { + static int * const verify16_fields[] = { &hf_scsi_ssc_verify16_immed, &hf_scsi_ssc_bytcmp, &hf_scsi_ssc_fixed, @@ -331,7 +331,7 @@ dissect_ssc_verify6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *verify6_fields[] = { + static int * const verify6_fields[] = { &hf_scsi_ssc_verify16_immed, &hf_scsi_ssc_bytcmp, &hf_scsi_ssc_fixed, @@ -357,7 +357,7 @@ dissect_ssc_readreverse16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rr16_fields[] = { + static int * const rr16_fields[] = { &hf_scsi_ssc_bytord, &hf_scsi_ssc_sili, &hf_scsi_ssc_fixed, @@ -385,7 +385,7 @@ dissect_ssc_write6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *write6_fields[] = { + static int * const write6_fields[] = { &hf_scsi_ssc_immed, NULL }; @@ -409,7 +409,7 @@ dissect_ssc_writefilemarks6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *wf6_fields[] = { + static int * const wf6_fields[] = { &hf_scsi_ssc_immed, NULL }; @@ -433,11 +433,11 @@ dissect_ssc_loadunload (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *loadunload_immed_fields[] = { + static int * const loadunload_immed_fields[] = { &hf_scsi_ssc_immed, NULL }; - static const int *loadunload_fields[] = { + static int * const loadunload_fields[] = { &hf_scsi_ssc_hold, &hf_scsi_ssc_eot, &hf_scsi_ssc_reten, @@ -492,7 +492,7 @@ dissect_ssc_rewind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *rewind_fields[] = { + static int * const rewind_fields[] = { &hf_scsi_ssc_immed, NULL }; @@ -515,7 +515,7 @@ dissect_ssc_setcapacity (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *sc_fields[] = { + static int * const sc_fields[] = { &hf_scsi_ssc_immed, NULL }; @@ -538,7 +538,7 @@ dissect_ssc_locate10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *locate_fields[] = { + static int * const locate_fields[] = { &hf_scsi_ssc_bt, &hf_scsi_ssc_cp, &hf_scsi_ssc_immed, @@ -564,13 +564,13 @@ dissect_ssc_locate16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *locate_fields[] = { + static int * const locate_fields[] = { &hf_scsi_ssc_dest_type, &hf_scsi_ssc_cp, &hf_scsi_ssc_immed, NULL }; - static const int *bam_fields[] = { + static int * const bam_fields[] = { &hf_scsi_ssc_bam, NULL }; @@ -614,7 +614,7 @@ dissect_ssc_erase16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *erase16_fields[] = { + static int * const erase16_fields[] = { &hf_scsi_ssc_fcs, &hf_scsi_ssc_lcs, &hf_scsi_ssc_erase_immed, @@ -694,7 +694,7 @@ dissect_ssc_formatmedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *formatmedium_fields[] = { + static int * const formatmedium_fields[] = { &hf_scsi_ssc_verify, &hf_scsi_ssc_immed, NULL @@ -750,7 +750,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre case SHORT_FORM_BLOCK_ID: case SHORT_FORM_VENDOR_SPECIFIC: { - static const int * block_id_flags[] = { + static int * const block_id_flags[] = { &hf_scsi_ssc_readposition_bop, &hf_scsi_ssc_readposition_eop, &hf_scsi_ssc_readposition_bcu, @@ -795,7 +795,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre case LONG_FORM: { - static const int * long_form_flags[] = { + static int * const long_form_flags[] = { &hf_scsi_ssc_readposition_bop, &hf_scsi_ssc_readposition_eop, &hf_scsi_ssc_readposition_mpu, @@ -833,7 +833,7 @@ dissect_ssc_readposition (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre case EXTENDED_FORM: { - static const int * extended_form_flags[] = { + static int * const extended_form_flags[] = { &hf_scsi_ssc_readposition_bop, &hf_scsi_ssc_readposition_eop, &hf_scsi_ssc_readposition_bcu, diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 7c535906aa..08b2294b0a 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -773,7 +773,7 @@ static reassembly_table scsi_reassembly_table; /* * Required by all commands */ -const int *cdb_control_fields[6] = { +int * const cdb_control_fields[6] = { &hf_scsi_control_vendor_specific, &hf_scsi_control_reserved, &hf_scsi_control_naca, @@ -3072,11 +3072,11 @@ static const value_string inq_tpgs_vals[] = { static int dissect_spc_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *tree, int version) { - static const int *sccs_fields_spc2[] = { + static int * const sccs_fields_spc2[] = { &hf_scsi_inq_sccs, NULL }; - static const int *sccs_fields_spc3[] = { + static int * const sccs_fields_spc3[] = { &hf_scsi_inq_sccs, &hf_scsi_inq_acc, &hf_scsi_inq_tpgs, @@ -3114,21 +3114,21 @@ dissect_spc_inq_sccsflags(tvbuff_t *tvb, int offset, proto_tree *tree, int versi static int dissect_spc_inq_bqueflags(tvbuff_t *tvb, int offset, proto_tree *tree, int version) { - static const int *bqe_fields_spc[] = { + static int * const bqe_fields_spc[] = { &hf_scsi_inq_encserv, &hf_scsi_inq_multip, &hf_scsi_inq_mchngr, &hf_scsi_inq_ackreqq, NULL }; - static const int *bqe_fields_spc2[] = { + static int * const bqe_fields_spc2[] = { &hf_scsi_inq_bque, &hf_scsi_inq_encserv, &hf_scsi_inq_multip, &hf_scsi_inq_mchngr, NULL }; - static const int *bqe_fields_spc4[] = { + static int * const bqe_fields_spc4[] = { &hf_scsi_inq_bque, &hf_scsi_inq_encserv, &hf_scsi_inq_multip, @@ -3164,25 +3164,25 @@ dissect_spc_inq_bqueflags(tvbuff_t *tvb, int offset, proto_tree *tree, int versi static int dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *tree, int version) { - static const int *reladr_fields_spc[] = { + static int * const reladr_fields_spc[] = { &hf_scsi_inq_reladr, &hf_scsi_inq_linked, &hf_scsi_inq_trandis, &hf_scsi_inq_cmdque, NULL }; - static const int *reladr_fields_spc2[] = { + static int * const reladr_fields_spc2[] = { &hf_scsi_inq_reladr, &hf_scsi_inq_linked, &hf_scsi_inq_cmdque, NULL }; - static const int *reladr_fields_spc3[] = { + static int * const reladr_fields_spc3[] = { &hf_scsi_inq_linked, &hf_scsi_inq_cmdque, NULL }; - static const int *reladr_fields_spc4[] = { + static int * const reladr_fields_spc4[] = { &hf_scsi_inq_cmdque, NULL }; @@ -3209,7 +3209,7 @@ dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *tree, int ver return offset; } -static const int *peripheral_fields[] = { +static int * const peripheral_fields[] = { &hf_scsi_inq_qualifier, &hf_scsi_inq_devtype, NULL @@ -3224,7 +3224,7 @@ dissect_spc_inquiry(tvbuff_t *tvb_a, packet_info *pinfo, { guint8 flags, i, version; - static const int *inq_control_fields[] = { + static int * const inq_control_fields[] = { &hf_scsi_inq_control_vendor_specific, &hf_scsi_inq_control_reserved, &hf_scsi_inq_control_naca, @@ -3232,7 +3232,7 @@ dissect_spc_inquiry(tvbuff_t *tvb_a, packet_info *pinfo, &hf_scsi_inq_control_obs2, NULL }; - static const int *aca_fields_spc[] = { + static int * const aca_fields_spc[] = { &hf_scsi_inq_aerc, /* obsolete in spc3 and forward */ &hf_scsi_inq_trmtsk,/* obsolete in spc2 and forward */ &hf_scsi_inq_normaca, @@ -3240,20 +3240,20 @@ dissect_spc_inquiry(tvbuff_t *tvb_a, packet_info *pinfo, &hf_scsi_inq_rdf, NULL }; - static const int *aca_fields_spc2[] = { + static int * const aca_fields_spc2[] = { &hf_scsi_inq_aerc, /* obsolete in spc3 and forward */ &hf_scsi_inq_normaca, &hf_scsi_inq_hisup, &hf_scsi_inq_rdf, NULL }; - static const int *aca_fields_spc3[] = { + static int * const aca_fields_spc3[] = { &hf_scsi_inq_normaca, &hf_scsi_inq_hisup, &hf_scsi_inq_rdf, NULL }; - static const int *rmb_fields[] = { + static int * const rmb_fields[] = { &hf_scsi_inq_rmb, NULL }; @@ -3422,13 +3422,13 @@ static const value_string cscd_desc_type_code_vals[] = { }; #endif -static const int *per_dev_type_bitmask_fields[] = { +static int * const per_dev_type_bitmask_fields[] = { &hf_scsi_spc_xcopy_lu_type, &hf_scsi_spc_xcopy_per_dev_type, NULL }; -static const int *xcopy_param_list_bits[] = { +static int * const xcopy_param_list_bits[] = { &hf_scsi_spc_xcopy_param_str, &hf_scsi_spc_xcopy_param_list_id_usage, &hf_scsi_spc_xcopy_param_priority, @@ -3734,11 +3734,11 @@ static int dissect_scsi_log_page(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset) { - static const int *pcflags_fields[] = { + static int * const pcflags_fields[] = { &hf_scsi_log_pagecode, NULL }; - static const int *paramflags_fields[] = { + static int * const paramflags_fields[] = { &hf_scsi_log_pf_du, &hf_scsi_log_pf_ds, &hf_scsi_log_pf_tsd, @@ -3842,12 +3842,12 @@ dissect_spc_logselect(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *ppcflags_fields[] = { + static int * const ppcflags_fields[] = { &hf_scsi_log_pcr, &hf_scsi_log_sp, NULL }; - static const int *pcflags_fields[] = { + static int * const pcflags_fields[] = { &hf_scsi_log_pc, NULL }; @@ -3885,12 +3885,12 @@ dissect_spc_logsense(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) { - static const int *ppcflags_fields[] = { + static int * const ppcflags_fields[] = { &hf_scsi_log_ppc, &hf_scsi_log_sp, NULL }; - static const int *pcflags_fields[] = { + static int * const pcflags_fields[] = { &hf_scsi_log_pc, &hf_scsi_log_pagecode, NULL @@ -4955,7 +4955,7 @@ dissect_spc_preventallowmediaremoval(tvbuff_t *tvb, packet_info *pinfo _U_, prot guint payload_len _U_, scsi_task_data_t *cdata _U_) { if (isreq && iscdb) { - static const int *prevent_allow_fields[] = { + static int * const prevent_allow_fields[] = { &hf_scsi_prevent_allow_prevent, NULL }; @@ -5064,7 +5064,7 @@ dissect_spc_persistentreserveout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr offset +8, 8, ENC_NA); if (cdata->itlq->flags == 0x07) { /* Service action REGISTER AND MOVE */ - const int *persresv_fields[] = { + static int * const persresv_fields[] = { &hf_scsi_persresv_control_rsvd, &hf_scsi_persresv_control_unreg, &hf_scsi_persresv_control_aptpl, @@ -5086,7 +5086,7 @@ dissect_spc_persistentreserveout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr } else { /* Other service actions than REGISTER AND MOVE. */ - const int *persresv_fields[] = { + static int * const persresv_fields[] = { &hf_scsi_persresv_control_rsvd1, &hf_scsi_persresv_control_spec_i_pt, &hf_scsi_persresv_control_all_tg_pt, @@ -5561,7 +5561,7 @@ dissect_scsi_descriptor_snsinfo(tvbuff_t *tvb, proto_tree *sns_tree, guint offse case 6: /*OSD object identification*/ if (desc_length==0x1e) { - static const int *command_functions[] = { + static int * const command_functions[] = { &hf_scsi_sns_osd_object_validation, &hf_scsi_sns_osd_object_cmd_cap_v, &hf_scsi_sns_osd_object_command, diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h index 58f26722d5..c574ed8fff 100644 --- a/epan/dissectors/packet-scsi.h +++ b/epan/dissectors/packet-scsi.h @@ -207,7 +207,7 @@ void dissect_scsi_snsinfo (tvbuff_t *, packet_info *, proto_tree *, guint, guint void dissect_scsi_lun(proto_tree *, tvbuff_t *, guint); -extern const int *cdb_control_fields[6]; +extern int * const cdb_control_fields[6]; extern gint ett_scsi_control; extern int hf_scsi_control; extern int hf_scsi_alloclen16; diff --git a/epan/dissectors/packet-scte35.c b/epan/dissectors/packet-scte35.c index 56943486b6..d6b435cb5a 100644 --- a/epan/dissectors/packet-scte35.c +++ b/epan/dissectors/packet-scte35.c @@ -506,7 +506,7 @@ dissect_scte35_splice_insert(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_item *ti; proto_tree *si_tree, *st_tree; - static const int *new_event_fields[] = { + static int * const new_event_fields[] = { &hf_out_of_network_indicator, &hf_program_splice_flag, &hf_duration_flag, @@ -736,7 +736,7 @@ dissect_scte35_splice_schedule(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_item *ti; proto_tree *ss_tree, *sp_tree, *component_tree; - static const int *splice_event_flags[] = { + static int * const splice_event_flags[] = { &hf_splice_out_of_network, &hf_splice_program_splice_flag, &hf_splice_duration_flag, @@ -1190,7 +1190,7 @@ dissect_scte35_splice_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset = 0, descriptor_offset = 0; tvbuff_t *command_tvb; - const gint *section_flags[] = { + static int * const section_flags[] = { &hf_section_syntax_indicator, &hf_private_indicator, &hf_reserved, @@ -1198,7 +1198,7 @@ dissect_scte35_splice_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, NULL }; - const gint *encrypt_flags[] = { + static int * const encrypt_flags[] = { &hf_encrypted_packet, &hf_encryption_algorithm, &hf_pts_adjustment, diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index b1b0c21518..5b09161cc4 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -3368,7 +3368,7 @@ dissect_data_chunk(tvbuff_t *chunk_tvb, guint16 header_length; guint16 payload_offset; - static const int* chunk_flags[] = { + static int* const chunk_flags[] = { &hf_data_chunk_i_bit, &hf_data_chunk_u_bit, &hf_data_chunk_b_bit, diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index eb6803f435..e2deaabe03 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -1919,7 +1919,7 @@ dissect_fastmsg_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o guint8 *tag_name_ptr; guint16 base_addr, num_addr, num_reg, addr1, addr2, crc16, crc16_calc, soe_num_blks; guint32 tod_ms, elmt_status32, elmt_ts_offset; - static const int * seq_fields[] = { + static int * const seq_fields[] = { &hf_selfm_fastmsg_seq_fir, &hf_selfm_fastmsg_seq_fin, &hf_selfm_fastmsg_seq_cnt, diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 39601cb398..fa71f20b92 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -796,7 +796,7 @@ static void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre { proto_tree *subtree; - static const int * ctrl_fields[] = { + static int * const ctrl_fields[] = { &hf_siii_mdt_hotplug_control_svc_switch, &hf_siii_mdt_hotplug_control_param, NULL @@ -814,7 +814,7 @@ static void dissect_siii_mdt_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static void dissect_siii_mdt_devctrl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * ctrl_fields[] = { + static int * const ctrl_fields[] = { &hf_siii_at_dev_control_ident, &hf_siii_mdt_dev_control_change_topology, &hf_siii_mdt_dev_control_top_control, @@ -830,7 +830,7 @@ static void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr proto_tree *subtree; proto_item *ti; - static const int * svch_fields[] = { + static int * const svch_fields[] = { &hf_siii_mdt_svch_dbe, /* data block element */ &hf_siii_mdt_svch_eot, /* end of transmission */ &hf_siii_mdt_svch_rw, /* read or write */ @@ -856,7 +856,7 @@ static void dissect_siii_mdt_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr static void dissect_siii_mdt_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * version_fields[] = { + static int * const version_fields[] = { &hf_siii_mdt_version_switch_off_sercos_telegrams, &hf_siii_mdt_version_fast_cp_switch, &hf_siii_mdt_version_transmission_of_communication_parameters_mdt0_cp0, @@ -968,7 +968,7 @@ static void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree static void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint devno _U_) /* devno will be used in later versions */ { - static const int * svch_fields[] = { + static int * const svch_fields[] = { &hf_siii_at_svch_valid, &hf_siii_at_svch_error, &hf_siii_at_svch_busy, @@ -984,7 +984,7 @@ static void dissect_siii_at_svc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre static void dissect_siii_at_devstat(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - static const int * status[] = { + static int * const status[] = { &hf_siii_at_dev_status_commwarning, &hf_siii_at_dev_status_change_topology, &hf_siii_at_dev_status_top_status, @@ -1004,7 +1004,7 @@ static void dissect_siii_at_hp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree { proto_tree *subtree; - static const int * status[] = { + static int * const status[] = { &hf_siii_at_hotplug_status_error, &hf_siii_at_hotplug_status_hp0_finished, &hf_siii_at_hotplug_status_param, diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 4dd01ef044..d9adcb0609 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -377,14 +377,14 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, gboolean has_user_information = TRUE; guint16 flags; asn1_ctx_t asn1_ctx; - static const int * item_option_flags[] = { + static int * const item_option_flags[] = { &hf_release_token, &hf_major_activity_token, &hf_synchronize_minor_token, &hf_data_token, NULL }; - static const int * transport_option_flags[] = { + static int * const transport_option_flags[] = { &hf_ses_transport_connection, &hf_ses_transport_user_abort, &hf_ses_transport_protocol_error, @@ -392,11 +392,11 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, &hf_ses_transport_implementation_restriction, NULL }; - static const int * protocol_options_flags[] = { + static int * const protocol_options_flags[] = { &hf_able_to_receive_extended_concatenated_SPDU, NULL }; - static const int * req_options_flags[] = { + static int * const req_options_flags[] = { &hf_session_exception_report, &hf_data_separation_function_unit, &hf_symmetric_synchronize_function_unit, @@ -413,12 +413,12 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree, &hf_half_duplex_function_unit, NULL }; - static const int * version_flags[] = { + static int * const version_flags[] = { &hf_protocol_version_2, &hf_protocol_version_1, NULL }; - static const int * enclosure_flags[] = { + static int * const enclosure_flags[] = { &hf_end_of_SSDU, &hf_beginning_of_SSDU, NULL diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 4e9b91ff69..aea2d41aa0 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -2246,7 +2246,7 @@ dissect_sflow_5_expanded_counters_sample(tvbuff_t *tvb, proto_tree *tree, gint o } } -static const int *sflow_lag_port_state_flags[] = { +static int * const sflow_lag_port_state_flags[] = { &hf_sflow_lag_port_actoradminstate, &hf_sflow_lag_port_actoroperstate, &hf_sflow_lag_port_partneradminstate, diff --git a/epan/dissectors/packet-simple.c b/epan/dissectors/packet-simple.c index 8ffe852910..cdb831e659 100644 --- a/epan/dissectors/packet-simple.c +++ b/epan/dissectors/packet-simple.c @@ -291,7 +291,7 @@ static void dissect_simple_link16(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t } } -static const int *simple_status_dx_flag_fields[] = { +static int * const simple_status_dx_flag_fields[] = { &hf_simple_status_dx_flag_system_messages, &hf_simple_status_dx_flag_common_tims_bims, &hf_simple_status_dx_flag_common_toms_boms, diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index 3c6ae2148e..d113a3d9c5 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -103,7 +103,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ static const gchar *flags_str[] = {"", "", "", "", "", "", "", "No-buffers" }; - static const int * signal_flags[] = { + static int * const signal_flags[] = { &hf_dcd, &hf_rts, &hf_cts, @@ -149,7 +149,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ signal_flags, signals, BMT_NO_FALSE|BMT_NO_TFS); if ((flags & SITA_FRAME_DIR) == SITA_FRAME_DIR_RXED) { - static const int * errors1_flags[] = { + static int * const errors1_flags[] = { &hf_shortframe, &hf_longframe, &hf_collision, @@ -158,7 +158,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ NULL }; - static const int * errors2_flags[] = { + static int * const errors2_flags[] = { &hf_break, &hf_crc, &hf_length, @@ -180,7 +180,7 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ ett_sita_errors2, NULL, "Receive Status: 0x%02x %s", errors2, errors2_string); proto_tree_add_bitmask_list_value(sita_errors2_tree, tvb, 0, 0, errors2_flags, errors2); } else { - static const int * errors2_flags[] = { + static int * const errors2_flags[] = { &hf_rtxlimit, &hf_uarterror, &hf_lostcts, diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index dbe587872f..bf4735bd77 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -369,7 +369,7 @@ static const true_false_string tfs_os_nts = { static void dissect_election_criterion_os(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_election_os_wfw, &hf_election_os_ntw, &hf_election_os_nts, @@ -382,7 +382,7 @@ dissect_election_criterion_os(tvbuff_t *tvb, proto_tree *parent_tree, int offset static void dissect_election_criterion_desire(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_election_desire_flags_backup, &hf_election_desire_flags_standby, &hf_election_desire_flags_master, @@ -437,7 +437,7 @@ dissect_smb_server_type_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 flags; int i; - static const int * type_flags[] = { + static int * const type_flags[] = { &hf_server_type_workstation, &hf_server_type_server, &hf_server_type_sql, @@ -699,7 +699,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr break; case BROWSE_RESETBROWSERSTATE_ANNOUNCEMENT: { - static const int * flags[] = { + static int * const flags[] = { &hf_mb_reset_demote, &hf_mb_reset_flush, &hf_mb_reset_stop, diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index a1468aec1b..fb898e2336 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -198,7 +198,7 @@ dissect_smb_direct(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, guint rlen = tvb_reported_length(tvb); gint len = 0; tvbuff_t *next_tvb = NULL; - static const int * flags[] = { + static int * const flags[] = { &hf_smb_direct_flags_response_requested, NULL }; diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index fb8808e476..91d2a2cc40 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -141,7 +141,7 @@ static int dissect_account_control(tvbuff_t *tvb, proto_tree *tree, int offset) { /* display the Allowable Account control bits */ - static const int * flags[] = { + static int * const flags[] = { &hf_flags_autolock, &hf_flags_expire, &hf_flags_server_trust, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index d668d7ad8e..9c397697ad 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1888,7 +1888,7 @@ typedef struct _smb_uid_t { static void smb_file_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 mask) { - static const int * mask_flags[] = { + static int * const mask_flags[] = { &hf_smb_file_access_mask_write_attribute, &hf_smb_file_access_mask_read_attribute, &hf_smb_file_access_mask_execute, @@ -1918,7 +1918,7 @@ struct access_mask_info smb_file_access_mask_info = { static void smb_dir_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 mask) { - static const int * mask_flags[] = { + static int * const mask_flags[] = { &hf_smb_dir_access_mask_write_attribute, &hf_smb_dir_access_mask_read_attribute, &hf_smb_dir_access_mask_delete_child, @@ -2323,7 +2323,7 @@ static const true_false_string tfs_da_writetru = { static int dissect_access(tvbuff_t *tvb, proto_tree *parent_tree, int offset, int hf_access) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_access_writetru, &hf_smb_access_caching, &hf_smb_access_locality, @@ -2423,7 +2423,7 @@ static const true_false_string tfs_file_attribute_encrypted = { static int dissect_file_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_file_attr_archive_16bit, &hf_smb_file_attr_directory_16bit, &hf_smb_file_attr_volume_16bit, @@ -2457,7 +2457,7 @@ dissect_file_ext_attr_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset, * Does the Win32 API documentation, or the NT Native API book, * suggest anything? */ - static const int * mask_fields[] = { + static int * const mask_fields[] = { &hf_smb_file_eattr_read_only, &hf_smb_file_eattr_hidden, &hf_smb_file_eattr_system, @@ -2502,7 +2502,7 @@ dissect_file_ext_attr(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_dir_info_file_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_file_attr_read_only_8bit, &hf_smb_file_attr_hidden_8bit, &hf_smb_file_attr_system_8bit, @@ -2550,7 +2550,7 @@ static const true_false_string tfs_search_attribute_archive = { static int dissect_search_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_search_attribute_read_only, &hf_smb_search_attribute_hidden, &hf_smb_search_attribute_system, @@ -2576,7 +2576,7 @@ dissect_search_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_extended_file_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_file_attr_read_only_16bit, &hf_smb_file_attr_hidden_16bit, &hf_smb_file_attr_system_16bit, @@ -2704,7 +2704,7 @@ dissect_negprot_capabilities(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { guint32 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_smb_server_cap_raw_mode, &hf_smb_server_cap_mpx_mode, &hf_smb_server_cap_unicode, @@ -2747,7 +2747,7 @@ static const true_false_string tfs_rm_write = { static int dissect_negprot_rawmode(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_rm_read, &hf_smb_rm_write, NULL @@ -2784,12 +2784,12 @@ static const true_false_string tfs_sm_sig_required = { static int dissect_negprot_security_mode(tvbuff_t *tvb, proto_tree *parent_tree, int offset, int wc) { - static const int * flags13[] = { + static int * const flags13[] = { &hf_smb_sm_mode16, &hf_smb_sm_password16, NULL }; - static const int * flags17[] = { + static int * const flags17[] = { &hf_smb_sm_mode, &hf_smb_sm_password, &hf_smb_sm_signatures, @@ -3630,7 +3630,7 @@ static const value_string of_open[] = { static int dissect_open_function(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_open_function_create, &hf_smb_open_function_open, NULL @@ -3658,7 +3658,7 @@ static const true_false_string tfs_mf_verify = { static int dissect_move_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_move_flags_verify, &hf_smb_move_flags_dir, &hf_smb_move_flags_file, @@ -3686,7 +3686,7 @@ static const true_false_string tfs_cf_ea_action = { static int dissect_copy_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_copy_flags_ea_action, &hf_smb_copy_flags_tree_copy, &hf_smb_copy_flags_verify, @@ -3941,7 +3941,7 @@ dissect_nt_create_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset, * in the response. However, Windows does not do that. Or at least * Win2K doesn't. */ - static const int * fields[] = { + static int * const fields[] = { &hf_smb_nt_create_bits_oplock, &hf_smb_nt_create_bits_boplock, &hf_smb_nt_create_bits_dir, @@ -3974,7 +3974,7 @@ dissect_smb_access_mask_bits(tvbuff_t *tvb, proto_tree *parent_tree, * and others come from the section on ZwOpenFile in "Windows(R) * NT(R)/2000 Native API Reference". */ - static const int * fields[] = { + static int * const fields[] = { &hf_smb_nt_access_mask_read, &hf_smb_nt_access_mask_write, &hf_smb_nt_access_mask_append, @@ -4029,7 +4029,7 @@ dissect_nt_share_access_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset, int len, guint32 mask) { proto_item *item; - static const int * fields[] = { + static int * const fields[] = { &hf_smb_nt_share_access_read, &hf_smb_nt_share_access_write, &hf_smb_nt_share_access_delete, @@ -4069,7 +4069,7 @@ dissect_nt_create_options_bits(tvbuff_t *tvb, proto_tree *parent_tree, * * http://www.samba.org/samba/ftp/specs/smb-nt01.doc */ - static const int * fields[] = { + static int * const fields[] = { &hf_smb_nt_create_options_directory_file, &hf_smb_nt_create_options_write_through, &hf_smb_nt_create_options_sequential_only, @@ -6249,7 +6249,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree *tr = NULL; int old_offset = offset; smb_locking_saved_info_t *ld = NULL; - static const int * locks[] = { + static int * const locks[] = { &hf_smb_lock_type_large, &hf_smb_lock_type_cancel, &hf_smb_lock_type_change, @@ -6607,7 +6607,7 @@ static const true_false_string tfs_oa_lock = { static int dissect_open_action(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_open_action_lock, &hf_smb_open_action_open, NULL @@ -6805,12 +6805,12 @@ static const value_string ipc_state_read_mode_vals[] = { int dissect_ipc_state(tvbuff_t *tvb, proto_tree *parent_tree, int offset, gboolean setstate_flag) { - static const int * setstate_flags[] = { + static int * const setstate_flags[] = { &hf_smb_ipc_state_nonblocking, &hf_smb_ipc_state_read_mode, NULL }; - static const int * not_setstate_flags[] = { + static int * const not_setstate_flags[] = { &hf_smb_ipc_state_nonblocking, &hf_smb_ipc_state_endpoint, &hf_smb_ipc_state_pipe_type, @@ -7518,7 +7518,7 @@ static const true_false_string tfs_setup_action_guest = { static int dissect_setup_action(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_setup_action_guest, NULL }; @@ -8111,7 +8111,7 @@ static const true_false_string tfs_connect_support_extended_signature = { static int dissect_connect_support_bits(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_connect_support_search, &hf_smb_connect_support_in_dfs, &hf_smb_connect_support_csc_mask_vals, @@ -8144,7 +8144,7 @@ static const true_false_string tfs_extended_response = { static int dissect_connect_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_connect_flags_dtid, &hf_smb_connect_flags_ext_sig, &hf_smb_connect_flags_ext_resp, @@ -8721,7 +8721,7 @@ static const value_string is_directory_vals[] = { static int dissect_nt_security_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_nt_security_flags_context_tracking, &hf_smb_nt_security_flags_effective_only, NULL @@ -8834,7 +8834,7 @@ static const true_false_string tfs_nt_create_options_open_for_free_space_query = int dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_nt_notify_file_name, &hf_smb_nt_notify_dir_name, &hf_smb_nt_notify_attributes, @@ -8859,7 +8859,7 @@ dissect_nt_notify_completion_filter(tvbuff_t *tvb, proto_tree *parent_tree, int static int dissect_nt_ioctl_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_nt_ioctl_flags_root_handle, NULL }; @@ -8902,7 +8902,7 @@ static const true_false_string tfs_nt_qsd_sacl = { int dissect_security_information_mask(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_nt_qsd_owner, &hf_smb_nt_qsd_group, &hf_smb_nt_qsd_dacl, @@ -11301,7 +11301,7 @@ dissect_ff2_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in { guint16 mask; smb_transact2_info_t *t2i; - static const int * flags[] = { + static int * const flags[] = { &hf_smb_ff2_backup, &hf_smb_ff2_continue, &hf_smb_ff2_resume, @@ -11332,7 +11332,7 @@ dissect_ff2_flags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in static int dissect_sfi_ioflag(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_sfi_writetru, &hf_smb_sfi_caching, NULL @@ -11808,7 +11808,7 @@ static guint16 dissect_transaction_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { guint16 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_smb_transaction_flags_owt, &hf_smb_transaction_flags_dtid, NULL @@ -11824,7 +11824,7 @@ dissect_transaction_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_get_dfs_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_get_dfs_server_hold_storage, &hf_smb_get_dfs_fielding, NULL @@ -11839,7 +11839,7 @@ dissect_get_dfs_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_dfs_referral_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_dfs_referral_flags_name_list_referral, &hf_smb_dfs_referral_flags_target_set_boundary, NULL @@ -13040,7 +13040,7 @@ dissect_qspi_unix_acl(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, guint16 *bcp, gboolean *trunc) { guint16 num_file_aces; - static const int *perm_fields[] = { + static int * const perm_fields[] = { &hf_smb_posix_ace_perm_read, &hf_smb_posix_ace_perm_write, &hf_smb_posix_ace_perm_execute, @@ -13241,7 +13241,7 @@ static const true_false_string tfs_i2f_hidden = { static int dissect_unix_info2_file_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset, int hf) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_unix_info2_file_flags_secure_delete, &hf_smb_unix_info2_file_flags_enable_undelete, &hf_smb_unix_info2_file_flags_synchronous, @@ -13810,7 +13810,7 @@ static const true_false_string tfs_quota_flags_enabled = { static void dissect_quota_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int *mask[] = { + static int * const mask[] = { &hf_smb_quota_flags_deny_disk, &hf_smb_quota_flags_log_warning, &hf_smb_quota_flags_log_limit, @@ -15764,7 +15764,7 @@ dissect_ff2_response_data(tvbuff_t * tvb, packet_info * pinfo, static int dissect_fs_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { /* case sensitive search */ &hf_smb_fs_attr_css, /* case preserved names */ @@ -15820,7 +15820,7 @@ dissect_fs_attributes(tvbuff_t *tvb, proto_tree *parent_tree, int offset) static int dissect_device_characteristics(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * mask[] = { + static int * const mask[] = { &hf_smb_device_char_removable, &hf_smb_device_char_read_only, &hf_smb_device_char_floppy, @@ -16279,7 +16279,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, } case 0x301: { /* MAC_QUERY_FS_INFO */ - static const int * support_flags[] = { + static int * const support_flags[] = { &hf_smb_mac_sup_access_ctrl, &hf_smb_mac_sup_getset_comments, &hf_smb_mac_sup_desktopdb_calls, @@ -17843,7 +17843,7 @@ static const true_false_string tfs_smb_flags_response = { static int dissect_smb_flags(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_flags_response, &hf_smb_flags_notify, &hf_smb_flags_oplock, @@ -17913,7 +17913,7 @@ static const true_false_string tfs_smb_flags2_string = { static int dissect_smb_flags2(tvbuff_t *tvb, proto_tree *parent_tree, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb_flags2_string, &hf_smb_flags2_nt_error, &hf_smb_flags2_roe, diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index cff85be2db..3bbc6a06ff 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -2402,7 +2402,7 @@ dissect_smb2_file_all_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pa proto_item *item = NULL; proto_tree *tree = NULL; int length; - static const int *mode_fields[] = { + static int * const mode_fields[] = { &hf_smb2_mode_file_write_through, &hf_smb2_mode_file_sequential_only, &hf_smb2_mode_file_no_intermediate_buffering, @@ -3195,7 +3195,7 @@ dissect_smb2_buffercode(proto_tree *parent_tree, tvbuff_t *tvb, int offset, guin static int dissect_smb2_capabilities(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb2_cap_dfs, &hf_smb2_cap_leasing, &hf_smb2_cap_large_mtu, @@ -3220,7 +3220,7 @@ dissect_smb2_capabilities(proto_tree *parent_tree, tvbuff_t *tvb, int offset) static int dissect_smb2_secmode(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb2_secmode_flags_sign_enabled, &hf_smb2_secmode_flags_sign_required, NULL @@ -3237,7 +3237,7 @@ dissect_smb2_secmode(proto_tree *parent_tree, tvbuff_t *tvb, int offset) static int dissect_smb2_ses_req_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb2_ses_req_flags_session_binding, NULL }; @@ -3255,7 +3255,7 @@ dissect_smb2_ses_req_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) static int dissect_smb2_ses_flags(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb2_ses_flags_guest, &hf_smb2_ses_flags_null, &hf_smb2_ses_flags_encrypt, @@ -3295,7 +3295,7 @@ static const value_string share_cache_vals[] = { static int dissect_smb2_share_flags(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *sf_fields[] = { + static int * const sf_fields[] = { &hf_smb2_share_flags_dfs, &hf_smb2_share_flags_dfs_root, &hf_smb2_share_flags_restrict_exclusive_opens, @@ -3331,7 +3331,7 @@ dissect_smb2_share_flags(proto_tree *tree, tvbuff_t *tvb, int offset) static int dissect_smb2_share_caps(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *sc_fields[] = { + static int * const sc_fields[] = { &hf_smb2_share_caps_dfs, &hf_smb2_share_caps_continuous_availability, &hf_smb2_share_caps_scaleout, @@ -4149,7 +4149,7 @@ dissect_smb2_find_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i offset_length_buffer_t olb; const guint8 *buf; guint8 il; - static const int *f_fields[] = { + static int * const f_fields[] = { &hf_smb2_find_flags_restart_scans, &hf_smb2_find_flags_single_entry, &hf_smb2_find_flags_index_specified, @@ -5165,7 +5165,7 @@ dissect_additional_information_sec_mask(tvbuff_t *tvb, proto_tree *parent_tree, { /* Note that in SMB1 protocol some security flags were not defined yet - see dissect_security_information_mask() So for SMB2 we have to use own dissector */ - static const int * flags[] = { + static int * const flags[] = { &hf_smb2_getsetinfo_additional_owner, &hf_smb2_getsetinfo_additional_group, &hf_smb2_getsetinfo_additional_dacl, @@ -5782,7 +5782,7 @@ dissect_smb2_lock_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i while (lock_count--) { proto_item *lock_item = NULL; proto_tree *lock_tree = NULL; - static const int *lf_fields[] = { + static int * const lf_fields[] = { &hf_smb2_lock_flags_shared, &hf_smb2_lock_flags_exclusive, &hf_smb2_lock_flags_unlock, @@ -6155,7 +6155,7 @@ dissect_smb2_write_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 channel; guint32 length; guint64 off; - static const int *f_fields[] = { + static int * const f_fields[] = { &hf_smb2_write_flags_write_through, NULL }; @@ -6599,7 +6599,7 @@ static const value_string smb2_ioctl_sqos_status_vals[] = { static void dissect_smb2_FSCTL_STORAGE_QOS_CONTROL(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, gboolean data_in) { - static const int * operations[] = { + static int * const operations[] = { &hf_smb2_ioctl_sqos_op_set_logical_flow_id, &hf_smb2_ioctl_sqos_op_set_policy, &hf_smb2_ioctl_sqos_op_probe_policy, @@ -6804,7 +6804,7 @@ dissect_smb2_NETWORK_INTERFACE_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tre guint64 link_speed; gfloat val = 0; const char *unit = NULL; - static const int * capability_flags[] = { + static int * const capability_flags[] = { &hf_smb2_ioctl_network_interface_capability_rdma, &hf_smb2_ioctl_network_interface_capability_rss, NULL @@ -7085,7 +7085,7 @@ dissect_smb2_FSCTL_SET_COMPRESSION(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ static int dissect_smb2_FSCTL_SET_INTEGRITY_INFORMATION(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, gboolean data_in) { - const int *integrity_flags[] = { + static int * const integrity_flags[] = { &hf_smb2_integrity_flags_enforcement_off, NULL }; @@ -7609,7 +7609,7 @@ dissect_smb2_read_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i guint32 len; guint64 off; - static const int *flags[] = { + static int * const flags[] = { &hf_smb2_read_flags_unbuffered, &hf_smb2_read_flags_compressed, NULL @@ -7934,7 +7934,7 @@ dissect_smb2_DHnC_buffer_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree static void dissect_smb2_DH2Q_buffer_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, smb2_info_t *si _U_) { - static const int *dh2x_flags_fields[] = { + static int * const dh2x_flags_fields[] = { &hf_smb2_dh2x_buffer_flags_persistent_handle, NULL }; @@ -8085,13 +8085,13 @@ dissect_smb2_MxAc_buffer_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t #define SMB2_LEASE_FLAGS_BREAK_IN_PROGRESS 0x00000002 #define SMB2_LEASE_FLAGS_PARENT_LEASE_KEY_SET 0x00000004 -static const int *lease_state_fields[] = { +static int * const lease_state_fields[] = { &hf_smb2_lease_state_read_caching, &hf_smb2_lease_state_handle_caching, &hf_smb2_lease_state_write_caching, NULL }; -static const int *lease_flags_fields[] = { +static int * const lease_flags_fields[] = { &hf_smb2_lease_flags_break_ack_required, &hf_smb2_lease_flags_break_in_progress, &hf_smb2_lease_flags_parent_lease_key_set, @@ -8350,7 +8350,7 @@ dissect_smb2_app_instance_version_buffer_response(tvbuff_t *tvb, packet_info *pi report_create_context_malformed_buffer(tvb, pinfo, tree, "APP INSTANCE Version Response"); } -static const int *posix_flags_fields[] = { +static int * const posix_flags_fields[] = { &hf_smb2_posix_v1_case_sensitive, &hf_smb2_posix_v1_posix_lock, &hf_smb2_posix_v1_posix_file_semantics, @@ -8422,7 +8422,7 @@ static const value_string aapl_command_code_vals[] = { #define SMB2_AAPL_VOLUME_CAPS 0x00000002 #define SMB2_AAPL_MODEL_INFO 0x00000004 -static const int *aapl_server_query_bitmap_fields[] = { +static int * const aapl_server_query_bitmap_fields[] = { &hf_smb2_aapl_server_query_bitmask_server_caps, &hf_smb2_aapl_server_query_bitmask_volume_caps, &hf_smb2_aapl_server_query_bitmask_model_info, @@ -8434,7 +8434,7 @@ static const int *aapl_server_query_bitmap_fields[] = { #define SMB2_AAPL_UNIX_BASED 0x00000004 #define SMB2_AAPL_SUPPORTS_NFS_ACE 0x00000008 -static const int *aapl_server_query_caps_fields[] = { +static int * const aapl_server_query_caps_fields[] = { &hf_smb2_aapl_server_query_caps_supports_read_dir_attr, &hf_smb2_aapl_server_query_caps_supports_osx_copyfile, &hf_smb2_aapl_server_query_caps_unix_based, @@ -8498,7 +8498,7 @@ dissect_smb2_AAPL_buffer_request(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot #define SMB2_AAPL_CASE_SENSITIVE 0x00000002 #define SMB2_AAPL_SUPPORTS_FULL_SYNC 0x00000004 -static const int *aapl_server_query_volume_caps_fields[] = { +static int * const aapl_server_query_volume_caps_fields[] = { &hf_smb2_aapl_server_query_volume_caps_support_resolve_id, &hf_smb2_aapl_server_query_volume_caps_case_sensitive, &hf_smb2_aapl_server_query_volume_caps_supports_full_sync, @@ -8819,7 +8819,7 @@ dissect_smb2_create_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree guint64 end_of_file; guint32 attr_mask; offset_length_buffer_t e_olb; - static const int *create_rep_flags_fields[] = { + static int * const create_rep_flags_fields[] = { &hf_smb2_create_rep_flags_reparse_point, NULL }; @@ -10415,7 +10415,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea /* flags */ if (header_tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_smb2_flags_response, &hf_smb2_flags_async_cmd, &hf_smb2_flags_chained, diff --git a/epan/dissectors/packet-smp.c b/epan/dissectors/packet-smp.c index 70b900b4db..2a556fe236 100644 --- a/epan/dissectors/packet-smp.c +++ b/epan/dissectors/packet-smp.c @@ -88,7 +88,7 @@ dissect_smp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean guint32 flags, sid, smp_length; tvbuff_t* next_tvb; int parsed_bytes; - static const int *flag_fields[] = { + static int * const flag_fields[] = { &hf_smp_flags_syn, &hf_smp_flags_ack, &hf_smp_flags_fin, diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 80b2b83ef0..4278f1bace 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1108,14 +1108,14 @@ static const value_string vals_msc_addr_npi [] = { { 0x00, NULL } }; -static const gint *regdel_fields[] = { +static int * const regdel_fields[] = { &hf_smpp_regdel_receipt, &hf_smpp_regdel_acks, &hf_smpp_regdel_notif, NULL }; -static const gint *submit_msg_fields[] = { +static int * const submit_msg_fields[] = { &hf_smpp_esm_submit_msg_mode, &hf_smpp_esm_submit_msg_type, &hf_smpp_esm_submit_features, @@ -1473,7 +1473,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) (*offset) += length; break; case 0x0030: { /* ms_msg_wait_facilities */ - const gint *fields[] = { + static int * const fields[] = { &hf_smpp_msg_wait_ind, &hf_smpp_msg_wait_type, NULL @@ -1540,7 +1540,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) break; case 0x0302: { /* callback_num_pres_ind */ - const gint *fields[] = { + static int * const fields[] = { &hf_smpp_callback_num_pres, &hf_smpp_callback_num_scrn, NULL @@ -1741,7 +1741,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) break; case 0x1383: { /* its_session_info */ - const gint *fields[] = { + static int * const fields[] = { &hf_smpp_its_session_sequence, &hf_smpp_its_session_ind, NULL @@ -1797,7 +1797,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding if ((val & 0x80) == 0x80) { /* Reserved */ } else if ((val & 0xF0) == 0xF0) { - const gint *gsm_msg_control_fields[] = { + static int * const gsm_msg_control_fields[] = { &hf_smpp_dcs_reserved, &hf_smpp_dcs_charset, &hf_smpp_dcs_class, @@ -1806,7 +1806,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_bitmask_list_value(code_tree, tvb, off, 1, gsm_msg_control_fields, val); } else if (val & 0x10) { - const gint *gsm_mwi_control_class_fields[] = { + static int * const gsm_mwi_control_class_fields[] = { &hf_smpp_dcs_text_compression, &hf_smpp_dcs_class_present, &hf_smpp_dcs_charset, @@ -1816,7 +1816,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_bitmask_list_value(code_tree, tvb, off, 1, gsm_mwi_control_class_fields, val); } else { - const gint *gsm_mwi_control_fields[] = { + static int * const gsm_mwi_control_fields[] = { &hf_smpp_dcs_text_compression, &hf_smpp_dcs_class_present, &hf_smpp_dcs_charset, @@ -1833,7 +1833,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_uint(code_tree, hf_smpp_dcs_cbs_language, tvb, off, 1, val); } else if ((val & 0x40) == 0x40) { /* General Data Coding indication */ if (val & 0x10) { - const gint *gsm_cbs_gen_class_fields[] = { + static int * const gsm_cbs_gen_class_fields[] = { &hf_smpp_dcs_text_compression, &hf_smpp_dcs_class_present, &hf_smpp_dcs_charset, @@ -1843,7 +1843,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_bitmask_list_value(code_tree, tvb, off, 1, gsm_cbs_gen_class_fields, val); } else { - const gint *gsm_cbs_gen_fields[] = { + static int * const gsm_cbs_gen_fields[] = { &hf_smpp_dcs_text_compression, &hf_smpp_dcs_class_present, &hf_smpp_dcs_charset, @@ -1853,7 +1853,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_bitmask_list_value(code_tree, tvb, off, 1, gsm_cbs_gen_fields, val); } } else if ((val & 0x20) == 0x20) { /* Message with UDH structure */ - const gint *gsm_cbs_udh_fields[] = { + static int * const gsm_cbs_udh_fields[] = { &hf_smpp_dcs_charset, &hf_smpp_dcs_class, NULL @@ -1861,7 +1861,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_bitmask_list_value(code_tree, tvb, off, 1, gsm_cbs_udh_fields, val); } else if ((val & 0xF0) == 0xE0) { /* WAP Forum */ - const gint *gsm_cbs_wap_fields[] = { + static int * const gsm_cbs_wap_fields[] = { &hf_smpp_dcs_wap_charset, &hf_smpp_dcs_wap_class, NULL @@ -1869,7 +1869,7 @@ smpp_handle_dcs(proto_tree *tree, tvbuff_t *tvb, int *offset, guint8 *dataCoding proto_tree_add_bitmask_list_value(code_tree, tvb, off, 1, gsm_cbs_wap_fields, val); } else if ((val & 0xF0) == 0xF0) { /* Data coding / message handling */ - const gint *gsm_cbs_dcs_fields[] = { + static int * const gsm_cbs_dcs_fields[] = { &hf_smpp_dcs_reserved, &hf_smpp_dcs_charset, &hf_smpp_dcs_cbs_class, diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index d78d3544d2..722008ab57 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -881,7 +881,7 @@ static void dissect_optional_0d(tvbuff_t *tvb, proto_tree *tree) { int offset, len, pad; - static const int * fields[] = { + static int * const fields[] = { &hf_sna_nlp_opti_0d_target, &hf_sna_nlp_opti_0d_arb, &hf_sna_nlp_opti_0d_reliable, @@ -920,7 +920,7 @@ static void dissect_optional_0e(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int bits, offset; - static const int * fields[] = { + static int * const fields[] = { &hf_sna_nlp_opti_0e_gap, &hf_sna_nlp_opti_0e_idle, NULL @@ -981,7 +981,7 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *sub_tree; int len, pad, type, offset, num, sublen; - static const int * opti_14_si_fields[] = { + static int * const opti_14_si_fields[] = { &hf_sna_nlp_opti_14_si_refifo, &hf_sna_nlp_opti_14_si_mobility, &hf_sna_nlp_opti_14_si_dirsearch, @@ -990,7 +990,7 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) &hf_sna_nlp_opti_14_si_mnpsrscv, NULL }; - static const int * opti_14_rr_fields[] = { + static int * const opti_14_rr_fields[] = { &hf_sna_nlp_opti_14_rr_bfe, NULL }; @@ -1078,14 +1078,14 @@ static void dissect_optional_22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int bits, type; - static const int * opti_22_2_fields[] = { + static int * const opti_22_2_fields[] = { &hf_sna_nlp_opti_22_type, &hf_sna_nlp_opti_22_raa, &hf_sna_nlp_opti_22_parity, &hf_sna_nlp_opti_22_arb, NULL }; - static const int * opti_22_3_fields[] = { + static int * const opti_22_3_fields[] = { &hf_sna_nlp_opti_22_ratereq, &hf_sna_nlp_opti_22_raterep, NULL @@ -1204,19 +1204,19 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 nhdr_0, nhdr_1, nhdr_x, thdr_8, thdr_9, fid; guint32 thdr_len, thdr_dlf; guint16 subindx; - static const int * nlp_nhdr_0_fields[] = { + static int * const nlp_nhdr_0_fields[] = { &hf_sna_nlp_sm, &hf_sna_nlp_tpf, NULL }; - static const int * nlp_nhdr_1_fields[] = { + static int * const nlp_nhdr_1_fields[] = { &hf_sna_nlp_ft, &hf_sna_nlp_tspi, &hf_sna_nlp_slowdn1, &hf_sna_nlp_slowdn2, NULL }; - static const int * nlp_nhdr_8_fields[] = { + static int * const nlp_nhdr_8_fields[] = { &hf_sna_nlp_setupi, &hf_sna_nlp_somi, &hf_sna_nlp_eomi, @@ -1225,7 +1225,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, &hf_sna_nlp_retryi, NULL }; - static const int * nlp_nhdr_9_fields[] = { + static int * const nlp_nhdr_9_fields[] = { &hf_sna_nlp_lmi, &hf_sna_nlp_cqfi, &hf_sna_nlp_osi, @@ -1408,7 +1408,7 @@ static void dissect_xid3(tvbuff_t *tvb, proto_tree *tree) { guint dlen, offset; - static const int * sna_xid_3_fields[] = { + static int * const sna_xid_3_fields[] = { &hf_sna_xid_3_init_self, &hf_sna_xid_3_stand_bind, &hf_sna_xid_3_gener_bind, @@ -1422,7 +1422,7 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree) &hf_sna_xid_3_cpchange, NULL }; - static const int * sna_xid_10_fields[] = { + static int * const sna_xid_10_fields[] = { &hf_sna_xid_3_asend_bind, &hf_sna_xid_3_arecv_bind, &hf_sna_xid_3_quiesce, @@ -1431,17 +1431,17 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree) &hf_sna_xid_3_pacing, NULL }; - static const int * sna_xid_11_fields[] = { + static int * const sna_xid_11_fields[] = { &hf_sna_xid_3_tgshare, &hf_sna_xid_3_dedsvc, NULL }; - static const int * sna_xid_12_fields[] = { + static int * const sna_xid_12_fields[] = { &hf_sna_xid_3_negcsup, &hf_sna_xid_3_negcomp, NULL }; - static const int * sna_xid_15_fields[] = { + static int * const sna_xid_15_fields[] = { &hf_sna_xid_3_partg, &hf_sna_xid_3_dlur, &hf_sna_xid_3_dlus, @@ -1826,7 +1826,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 th_byte, mft; guint16 def, oef; guint32 dsaf, osaf; - static const int * byte0_fields[] = { + static int * const byte0_fields[] = { &hf_sna_th_fid, &hf_sna_th_tg_sweep, &hf_sna_th_er_vr_supp_ind, @@ -1834,29 +1834,29 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) &hf_sna_th_ntwk_prty, NULL }; - static const int * byte1_fields[] = { + static int * const byte1_fields[] = { &hf_sna_th_tgsf, &hf_sna_th_mft, &hf_sna_th_piubf, NULL }; - static const int * byte2_mft_fields[] = { + static int * const byte2_mft_fields[] = { &hf_sna_th_nlpoi, &hf_sna_th_nlp_cp, &hf_sna_th_ern, NULL }; - static const int * byte2_fields[] = { + static int * const byte2_fields[] = { &hf_sna_th_iern, &hf_sna_th_ern, NULL }; - static const int * byte3_fields[] = { + static int * const byte3_fields[] = { &hf_sna_th_vrn, &hf_sna_th_tpf, NULL }; - static const int * byte4_fields[] = { + static int * const byte4_fields[] = { &hf_sna_th_vr_cwi, &hf_sna_th_tg_nonfifo_ind, &hf_sna_th_vr_sqti, @@ -1864,7 +1864,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) &hf_sna_th_tg_snf, NULL }; - static const int * byte6_fields[] = { + static int * const byte6_fields[] = { &hf_sna_th_vrprq, &hf_sna_th_vrprs, &hf_sna_th_vr_cwri, @@ -1873,7 +1873,7 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) &hf_sna_th_vr_snf_send, NULL }; - static const int * byte16_fields[] = { + static int * const byte16_fields[] = { &hf_sna_th_snai, /* We luck out here because in their infinite wisdom the SNA * architects placed the MPF and EFI fields in the same bitfield @@ -2151,7 +2151,7 @@ dissect_rh(tvbuff_t *tvb, int offset, proto_tree *tree) { gboolean is_response; guint8 rh_0; - static const int * sna_rh_fields[] = { + static int * const sna_rh_fields[] = { &hf_sna_rh_rri, &hf_sna_rh_ru_category, &hf_sna_rh_fi, @@ -2160,7 +2160,7 @@ dissect_rh(tvbuff_t *tvb, int offset, proto_tree *tree) &hf_sna_rh_eci, NULL }; - static const int * sna_rh_1_req_fields[] = { + static int * const sna_rh_1_req_fields[] = { &hf_sna_rh_dr1, &hf_sna_rh_lcci, &hf_sna_rh_dr2, @@ -2170,7 +2170,7 @@ dissect_rh(tvbuff_t *tvb, int offset, proto_tree *tree) &hf_sna_rh_pi, NULL }; - static const int * sna_rh_1_rsp_fields[] = { + static int * const sna_rh_1_rsp_fields[] = { &hf_sna_rh_dr1, &hf_sna_rh_dr2, &hf_sna_rh_rti, @@ -2178,7 +2178,7 @@ dissect_rh(tvbuff_t *tvb, int offset, proto_tree *tree) &hf_sna_rh_pi, NULL }; - static const int * sna_rh_2_req_fields[] = { + static int * const sna_rh_2_req_fields[] = { &hf_sna_rh_bbi, &hf_sna_rh_ebi, &hf_sna_rh_cdi, @@ -2236,7 +2236,7 @@ dissect_control_05hpr(tvbuff_t *tvb, proto_tree *tree, int hpr, enum parse parse) { guint16 offset, len, pad; - static const int * sna_control_05hpr_fields[] = { + static int * const sna_control_05hpr_fields[] = { &hf_sna_control_05_ptp, NULL }; diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index 72e44528be..80c1eddf34 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -181,7 +181,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U tvbuff_t *next_tvb, *npdu_tvb; gint len; gboolean first, more_frags, unack; - static const int * addr_fields[] = { + static int * const addr_fields[] = { &hf_sndcp_x, &hf_sndcp_f, &hf_sndcp_t, diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index 8b459360d5..33647bc906 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -169,23 +169,23 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *ti; guint8 frame_type; struct can_info can_info; - const int **can_flags; + int * const *can_flags; - static const int *can_std_flags[] = { + static int * const can_std_flags[] = { &hf_can_infoent_std, &hf_can_extflag, &hf_can_rtrflag, &hf_can_errflag, NULL, }; - static const int *can_ext_flags[] = { + static int * const can_ext_flags[] = { &hf_can_infoent_ext, &hf_can_extflag, &hf_can_rtrflag, &hf_can_errflag, NULL, }; - static const int *can_err_flags[] = { + static int * const can_err_flags[] = { &hf_can_errflag, &hf_can_err_tx_timeout, &hf_can_err_lostarb, @@ -239,7 +239,7 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (frame_type == LINUX_CAN_ERR) { - const int **flag; + int * const *flag; const char *sepa = ": "; col_set_str(pinfo->cinfo, COL_INFO, "ERR"); @@ -263,7 +263,7 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(can_tree, hf_can_err_lostarb_bit_number, tvb, CAN_DATA_OFFSET+0, 1, ENC_NA); if (can_info.id & CAN_ERR_CTRL) { - static const int *can_err_ctrl_flags[] = { + static int * const can_err_ctrl_flags[] = { &hf_can_err_ctrl_rx_overflow, &hf_can_err_ctrl_tx_overflow, &hf_can_err_ctrl_rx_warning, @@ -278,7 +278,7 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (can_info.id & CAN_ERR_PROT) { - static const int *can_err_prot_error_type_flags[] = { + static int * const can_err_prot_error_type_flags[] = { &hf_can_err_prot_error_type_bit, &hf_can_err_prot_error_type_form, &hf_can_err_prot_error_type_stuff, @@ -366,7 +366,7 @@ dissect_socketcanfd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, &hf_can_extflag, NULL, }; - static const int * canfd_flag_fields[] = { + static int * const canfd_flag_fields[] = { &hf_canfd_brsflag, &hf_canfd_esiflag, NULL, @@ -398,7 +398,7 @@ dissect_socketcanfd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ti = proto_tree_add_item(tree, proto_canfd, tvb, 0, -1, ENC_NA); can_tree = proto_item_add_subtree(ti, ett_can_fd); - proto_tree_add_bitmask_list(can_tree, tvb, 0, 4, (const int**)can_flags_fd, encoding); + proto_tree_add_bitmask_list(can_tree, tvb, 0, 4, can_flags_fd, encoding); proto_tree_add_item(can_tree, hf_can_len, tvb, CAN_LEN_OFFSET, 1, ENC_NA); proto_tree_add_bitmask_list(can_tree, tvb, CANFD_FLAG_OFFSET, 1, canfd_flag_fields, ENC_NA); diff --git a/epan/dissectors/packet-someip-sd.c b/epan/dissectors/packet-someip-sd.c index 8deb1e1749..6fff8d30ab 100644 --- a/epan/dissectors/packet-someip-sd.c +++ b/epan/dissectors/packet-someip-sd.c @@ -660,7 +660,7 @@ dissect_someip_sd_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void gboolean stop_parsing_after_entries = FALSE; guint32 offset_entriesarray; - static const int * someipsd_flags[] = { + static int * const someipsd_flags[] = { &hf_someip_sd_rebootflag, &hf_someip_sd_unicastflag, &hf_someip_sd_explicitiniteventflag, diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c index 43e5f073dd..04c193628a 100644 --- a/epan/dissectors/packet-someip.c +++ b/epan/dissectors/packet-someip.c @@ -2564,7 +2564,7 @@ dissect_someip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void gint tvb_length = tvb_captured_length_remaining(tvb, offset); - static const int *someip_tp_flags[] = { + static int * const someip_tp_flags[] = { &hf_someip_tp_reserved, &hf_someip_tp_more_segments, NULL diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index c218327d88..5c8275eb3b 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -2881,7 +2881,7 @@ dissect_spice_common_capabilities(tvbuff_t *tvb, packet_info* pinfo, proto_tree /* TODO: save common and per-channel capabilities in spice_info ? */ guint i; guint32 val; - static const int * caps[] = { + static int * const caps[] = { &hf_common_cap_auth_select, &hf_common_cap_auth_spice, &hf_common_cap_auth_sasl, @@ -2927,7 +2927,7 @@ dissect_spice_link_capabilities(tvbuff_t *tvb, packet_info* pinfo, proto_tree *t switch (spice_info->channel_type) { case SPICE_CHANNEL_PLAYBACK: { - const int * playback_cap[] = { + int * const playback_cap[] = { &hf_playback_cap_celt_0_5_1, &hf_playback_cap_volume, &hf_playback_cap_latency, @@ -2943,7 +2943,7 @@ dissect_spice_link_capabilities(tvbuff_t *tvb, packet_info* pinfo, proto_tree *t break; case SPICE_CHANNEL_MAIN: { - const int * main_cap[] = { + int * const main_cap[] = { &hf_main_cap_semi_migrate, &hf_main_cap_vm_name_uuid, /*Note: only relevant for client. TODO: dissect only for client */ &hf_main_cap_agent_connected_tokens, @@ -2959,7 +2959,7 @@ dissect_spice_link_capabilities(tvbuff_t *tvb, packet_info* pinfo, proto_tree *t break; case SPICE_CHANNEL_DISPLAY: { - const int * display_cap[] = { + int * const display_cap[] = { &hf_display_cap_sized_stream, &hf_display_cap_monitors_config, &hf_display_cap_composite, @@ -2991,7 +2991,7 @@ dissect_spice_link_capabilities(tvbuff_t *tvb, packet_info* pinfo, proto_tree *t break; case SPICE_CHANNEL_RECORD: { - const int * record_cap[] = { + int * const record_cap[] = { &hf_record_cap_celt, &hf_record_cap_volume, &hf_record_cap_opus, diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index a69d13a2b8..3555fe55ba 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -215,7 +215,7 @@ dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const int * ContextFlags_bits[] = { +static int * const ContextFlags_bits[] = { &hf_spnego_ContextFlags_delegFlag, &hf_spnego_ContextFlags_mutualFlag, &hf_spnego_ContextFlags_replayFlag, @@ -1370,7 +1370,7 @@ dissect_spnego_krb5_cfx_flags(tvbuff_t *tvb, int offset, proto_tree *spnego_krb5_tree, guint8 cfx_flags _U_) { - static const int * flags[] = { + static int * const flags[] = { &hf_spnego_krb5_cfx_flags_04, &hf_spnego_krb5_cfx_flags_02, &hf_spnego_krb5_cfx_flags_01, diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index f9708a9166..711a371b06 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -100,7 +100,7 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) guint16 spp_seq; const char *spp_msg_string; guint16 low_socket, high_socket; - static const int * ctrl[] = { + static int * const ctrl[] = { &hf_spp_connection_control_sys, &hf_spp_connection_control_send_ack, &hf_spp_connection_control_attn, diff --git a/epan/dissectors/packet-srt.c b/epan/dissectors/packet-srt.c index 5c15b9a43e..aeecd69600 100644 --- a/epan/dissectors/packet-srt.c +++ b/epan/dissectors/packet-srt.c @@ -375,7 +375,7 @@ static void srt_format_hs_ext_hsreq(proto_tree* tree, tvbuff_t* tvb, int baseoff const int vpatch = version & 0xff; proto_item_append_text(pi, " (%d.%d.%d)", vmajor, vminor, vpatch); - static const int * ext_hs_flags[] = { + static int * const ext_hs_flags[] = { &hf_srt_handshake_ext_flag_tsbpd_snd, &hf_srt_handshake_ext_flag_tsbpd_rcv, &hf_srt_handshake_ext_flag_haicrypt, @@ -421,7 +421,7 @@ static void dissect_srt_hs_ext_field(proto_tree* tree, return; } - static const int * ext_hs_ext_field_flags[] = { + static int * const ext_hs_ext_field_flags[] = { &hf_srt_handshake_ext_field_v5_flag_hsreq, &hf_srt_handshake_ext_field_v5_flag_kmreq, &hf_srt_handshake_ext_field_v5_flag_config, diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index d960659ed1..e8887394c4 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -815,7 +815,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_uint(srvloc_tree, hf_srvloc_function, tvb, offset + 1, 1, function); if (version < 2) { - static const int * v1_flags[] = { + static int * const v1_flags[] = { &hf_srvloc_flags_v1_overflow, &hf_srvloc_flags_v1_monolingual, &hf_srvloc_flags_v1_url_auth, @@ -1027,7 +1027,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ } } else { /* Version 2 */ - static const int * v2_flags[] = { + static int * const v2_flags[] = { &hf_srvloc_flags_v2_overflow, &hf_srvloc_flags_v2_fresh, &hf_srvloc_flags_v2_reqmulti, diff --git a/epan/dissectors/packet-stt.c b/epan/dissectors/packet-stt.c index aeb6b214cc..9c62aba15e 100644 --- a/epan/dissectors/packet-stt.c +++ b/epan/dissectors/packet-stt.c @@ -234,7 +234,7 @@ dissect_stt_checksum(tvbuff_t *tvb, packet_info *pinfo, proto_tree *stt_tree) static int dissect_tcp_flags(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *flags[] = { + static int * const flags[] = { &hf_stt_tcp_rsvd, &hf_stt_tcp_ns, &hf_stt_tcp_cwr, @@ -308,7 +308,7 @@ dissect_tcp_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *stt_tree) static int dissect_stt_flags(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *flags[] = { + static int * const flags[] = { &hf_stt_flag_rsvd, &hf_stt_flag_tcp, &hf_stt_flag_ipv4, diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 9876bf6911..d10fc97abe 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -1105,7 +1105,7 @@ static const value_string interworking_values[] = { static void dissect_asp_capabilities_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_sua_asp_capabilities_reserved_bits, &hf_sua_asp_capabilities_a_bit, &hf_sua_asp_capabilities_b_bit, @@ -1277,7 +1277,7 @@ static const true_false_string return_on_error_bit_value = { static void dissect_protocol_class_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_sua_return_on_error_bit, &hf_sua_protocol_class, NULL @@ -1314,7 +1314,7 @@ static const true_false_string first_bit_value = { static void dissect_segmentation_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree) { - static const int * first_remaining[] = { + static int * const first_remaining[] = { &hf_sua_first_bit, &hf_sua_number_of_remaining_segments, NULL diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index fb28762752..a5e9fb20a4 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -158,7 +158,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv guint32 qual; guint32 i; - static const int *q_flags[] = { + static int * const q_flags[] = { &hf_sv_phsmeas_q_validity, &hf_sv_phsmeas_q_overflow, &hf_sv_phsmeas_q_outofrange, diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index 9f3b185ea1..3951fa57d3 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -1679,7 +1679,7 @@ dissect_t124_DataPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const int * Segmentation_bits[] = { +static int * const Segmentation_bits[] = { &hf_t124_Segmentation_begin, &hf_t124_Segmentation_end, NULL diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index ec0a6431a4..958d2fe1ff 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1018,7 +1018,7 @@ dissect_tcap_TCMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * AUDT_protocol_version_bits[] = { +static int * const AUDT_protocol_version_bits[] = { &hf_tcap_AUDT_protocol_version_version1, NULL }; @@ -1118,7 +1118,7 @@ dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const int * AARQ_protocol_version_bits[] = { +static int * const AARQ_protocol_version_bits[] = { &hf_tcap_AARQ_protocol_version_version1, NULL }; @@ -1189,7 +1189,7 @@ dissect_tcap_AARQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset } -static const int * AARE_protocol_version_bits[] = { +static int * const AARE_protocol_version_bits[] = { &hf_tcap_AARE_protocol_version_version1, NULL }; diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index a11e6d0c62..afb8e670a4 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -597,7 +597,7 @@ static guint32 mptcp_stream_count; */ static wmem_tree_t *mptcp_tokens = NULL; -static const int *tcp_option_mptcp_capable_v0_flags[] = { +static int * const tcp_option_mptcp_capable_v0_flags[] = { &hf_tcp_option_mptcp_checksum_flag, &hf_tcp_option_mptcp_B_flag, &hf_tcp_option_mptcp_H_v0_flag, @@ -605,7 +605,7 @@ static const int *tcp_option_mptcp_capable_v0_flags[] = { NULL }; -static const int *tcp_option_mptcp_capable_v1_flags[] = { +static int * const tcp_option_mptcp_capable_v1_flags[] = { &hf_tcp_option_mptcp_checksum_flag, &hf_tcp_option_mptcp_B_flag, &hf_tcp_option_mptcp_H_v1_flag, @@ -613,12 +613,12 @@ static const int *tcp_option_mptcp_capable_v1_flags[] = { NULL }; -static const int *tcp_option_mptcp_join_flags[] = { +static int * const tcp_option_mptcp_join_flags[] = { &hf_tcp_option_mptcp_backup_flag, NULL }; -static const int *tcp_option_mptcp_dss_flags[] = { +static int * const tcp_option_mptcp_dss_flags[] = { &hf_tcp_option_mptcp_F_flag, &hf_tcp_option_mptcp_m_flag, &hf_tcp_option_mptcp_M_flag, @@ -5607,7 +5607,7 @@ dissect_tcpopt_rvbd_trpy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo guint16 sport, dport, flags; int offset = 0, optlen = tvb_reported_length(tvb); - static const int * rvbd_trpy_flags[] = { + static int * const rvbd_trpy_flags[] = { &hf_tcp_option_rvbd_trpy_flag_fw_rst_probe, &hf_tcp_option_rvbd_trpy_flag_fw_rst_inner, &hf_tcp_option_rvbd_trpy_flag_fw_rst, diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c index d85d5a0ceb..b6baa6eb13 100644 --- a/epan/dissectors/packet-tdmoe.c +++ b/epan/dissectors/packet-tdmoe.c @@ -50,7 +50,7 @@ dissect_tdmoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U guint16 channels; guint16 subaddress; gint32 offset = 0; - static const gint *flags[] = { &hf_tdmoe_yellow_alarm, &hf_tdmoe_sig_bits_present, NULL }; + static int * const flags[] = { &hf_tdmoe_yellow_alarm, &hf_tdmoe_sig_bits_present, NULL }; int chan; /* Check that there's enough data */ diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 6d9d944820..d1c19c8785 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2822,7 +2822,7 @@ dissect_tds_query_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, td /* offset += len; */ } -static const int *dbrpc_options_hf_fields[] = { +static int * const dbrpc_options_hf_fields[] = { &hf_tds_dbrpc_options_recompile, &hf_tds_dbrpc_options_params, NULL @@ -2961,7 +2961,7 @@ dissect_tds5_curclose_token(tvbuff_t *tvb, packet_info *pinfo, guint offset, return cur - offset; } -static const int *tds_curdeclare_hf_fields[] = { +static int * const tds_curdeclare_hf_fields[] = { &hf_tds_curdeclare_options_rdonly, &hf_tds_curdeclare_options_updatable, &hf_tds_curdeclare_options_sensitive, @@ -3127,7 +3127,7 @@ dissect_tds5_curfetch_token(tvbuff_t *tvb, packet_info *pinfo, guint offset, return cur - offset; } -static const int *tds_curinfo_hf_fields[] = { +static int * const tds_curinfo_hf_fields[] = { &hf_tds_curinfo_cursor_status_declared, &hf_tds_curinfo_cursor_status_open, &hf_tds_curinfo_cursor_status_closed, @@ -3278,7 +3278,13 @@ dissect_tds5_curopen_token(tvbuff_t *tvb, packet_info *pinfo, guint offset, return cur - offset; } -static const int *hf_req_0[9] = { +/* + * Each of these covers the 8 bits of a byte, so they have + * 9 elements - one for each bit, plus the terminating NULL. + * + * Some have early NULLs as placeholders. + */ +static int * const hf_req_0[9] = { &hf_tds_capability_req_lang, &hf_tds_capability_req_rpc, &hf_tds_capability_req_evt, @@ -3288,7 +3294,7 @@ static const int *hf_req_0[9] = { &hf_tds_capability_req_dynf, NULL, NULL}; /* Two nulls until I can figure out the types. */ -static const int *hf_req_1[9] = { +static int * const hf_req_1[9] = { &hf_tds_capability_req_msg, &hf_tds_capability_req_param, &hf_tds_capability_data_int1, @@ -3299,7 +3305,7 @@ static const int *hf_req_1[9] = { &hf_tds_capability_data_vchar, NULL}; -static const int *hf_req_2[9] = { +static int * const hf_req_2[9] = { &hf_tds_capability_data_bin, &hf_tds_capability_data_vbin, &hf_tds_capability_data_mny8, @@ -3310,7 +3316,7 @@ static const int *hf_req_2[9] = { &hf_tds_capability_data_flt8, NULL}; -static const int *hf_req_3[9] = { +static int * const hf_req_3[9] = { &hf_tds_capability_data_num, &hf_tds_capability_data_text, &hf_tds_capability_data_image, @@ -3321,7 +3327,7 @@ static const int *hf_req_3[9] = { &hf_tds_capability_data_datetimen, NULL}; -static const int *hf_req_4[9] = { +static int * const hf_req_4[9] = { &hf_tds_capability_data_moneyn, &hf_tds_capability_csr_prev, &hf_tds_capability_csr_first, @@ -3332,7 +3338,7 @@ static const int *hf_req_4[9] = { &hf_tds_capability_con_oob, NULL}; -static const int *hf_req_5[9] = { +static int * const hf_req_5[9] = { &hf_tds_capability_con_inband, &hf_tds_capability_con_logical, &hf_tds_capability_proto_text, @@ -3343,7 +3349,7 @@ static const int *hf_req_5[9] = { &hf_tds_capability_proto_dynamic, NULL}; -static const int *hf_req_6[9] = { +static int * const hf_req_6[9] = { &hf_tds_capability_proto_dynproc, &hf_tds_capability_data_fltn, &hf_tds_capability_data_bitn, @@ -3354,7 +3360,7 @@ static const int *hf_req_6[9] = { &hf_tds_capability_object_char, NULL}; -static const int *hf_req_7[9] = { +static int * const hf_req_7[9] = { &hf_tds_capability_object_binary, &hf_tds_capability_data_columnstatus, &hf_tds_capability_widetable, @@ -3364,7 +3370,7 @@ static const int *hf_req_7[9] = { NULL,NULL, /* 56 and 60 reserved */ NULL}; -static const int *hf_req_8[9] = { +static int * const hf_req_8[9] = { &hf_tds_capability_data_uintn, &hf_tds_capability_cur_implicit, &hf_tds_capability_data_nlbin, @@ -3375,7 +3381,7 @@ static const int *hf_req_8[9] = { &hf_tds_capability_data_date, NULL}; -static const int *hf_req_9[9] = { +static int * const hf_req_9[9] = { &hf_tds_capability_data_time, &hf_tds_capability_data_interval, &hf_tds_capability_csr_scroll, @@ -3386,7 +3392,7 @@ static const int *hf_req_9[9] = { &hf_tds_capability_req_srvpktsize, NULL}; -static const int *hf_req_10[9] = { +static int * const hf_req_10[9] = { &hf_tds_capability_data_unitext, &hf_tds_capability_cap_clusterfailover, &hf_tds_capability_data_sint1, @@ -3397,7 +3403,7 @@ static const int *hf_req_10[9] = { &hf_tds_capability_req_dbrpc2, NULL}; -static const int *hf_resp_0[9] = { +static int * const hf_resp_0[9] = { &hf_tds_capability_res_nomsg, &hf_tds_capability_res_noeed, &hf_tds_capability_res_noparam, @@ -3408,7 +3414,7 @@ static const int *hf_resp_0[9] = { NULL, /* 0 unused */ NULL}; -static const int *hf_resp_1[9] = { +static int * const hf_resp_1[9] = { &hf_tds_capability_data_nochar, &hf_tds_capability_data_novchar, &hf_tds_capability_data_nobin, @@ -3419,7 +3425,7 @@ static const int *hf_resp_1[9] = { &hf_tds_capability_data_nodate4, NULL}; -static const int *hf_resp_2[9] = { +static int * const hf_resp_2[9] = { &hf_tds_capability_data_noflt4, &hf_tds_capability_data_noflt8, &hf_tds_capability_data_nonum, @@ -3430,7 +3436,7 @@ static const int *hf_resp_2[9] = { &hf_tds_capability_data_nolbin, NULL}; -static const int *hf_resp_3[9] = { +static int * const hf_resp_3[9] = { &hf_tds_capability_data_nointn, &hf_tds_capability_data_nodatetimen, &hf_tds_capability_data_nomoneyn, @@ -3441,7 +3447,7 @@ static const int *hf_resp_3[9] = { &hf_tds_capability_data_nosensitivity, NULL}; -static const int *hf_resp_4[9] = { +static int * const hf_resp_4[9] = { &hf_tds_capability_data_noboundary, &hf_tds_capability_res_notdsdebug, &hf_tds_capability_res_nostripblanks, @@ -3452,7 +3458,7 @@ static const int *hf_resp_4[9] = { &hf_tds_capability_object_nobinary, NULL}; -static const int *hf_resp_5[9] = { +static int * const hf_resp_5[9] = { &hf_tds_capability_data_nouint2, &hf_tds_capability_data_nouint4, &hf_tds_capability_data_nouint8, @@ -3463,7 +3469,7 @@ static const int *hf_resp_5[9] = { NULL, /* 40 unused */ NULL}; -static const int *hf_resp_6[9] = { +static int * const hf_resp_6[9] = { &hf_tds_capability_blob_nonchar_16, &hf_tds_capability_blob_nonchar_8, &hf_tds_capability_blob_nonchar_scsu, @@ -3474,7 +3480,7 @@ static const int *hf_resp_6[9] = { &hf_tds_capability_data_nosint1, NULL}; -static const int *hf_resp_7[9] = { +static int * const hf_resp_7[9] = { &hf_tds_capability_no_largeident, &hf_tds_capability_no_blob_nchar_16, &hf_tds_capability_no_srvpktsize, @@ -3485,36 +3491,36 @@ static const int *hf_resp_7[9] = { &hf_tds_capability_res_suppress_doneinproc, NULL}; -static const int *hf_resp_8[9] = { +static int * const hf_resp_8[9] = { &hf_tds_capability_res_force_rowfmt2, NULL, NULL, NULL, /* 65-67 reserved */ NULL, NULL, NULL, NULL, /* 68-71 reserved */ NULL}; -static const int *(* const hf_req_array[])[9] = { - &hf_req_0, - &hf_req_1, - &hf_req_2, - &hf_req_3, - &hf_req_4, - &hf_req_5, - &hf_req_6, - &hf_req_7, - &hf_req_8, - &hf_req_9, - &hf_req_10 +static int * const *hf_req_array[] = { + hf_req_0, + hf_req_1, + hf_req_2, + hf_req_3, + hf_req_4, + hf_req_5, + hf_req_6, + hf_req_7, + hf_req_8, + hf_req_9, + hf_req_10 }; -static const int *(* const hf_resp_array[])[9] = { - &hf_resp_0, - &hf_resp_1, - &hf_resp_2, - &hf_resp_3, - &hf_resp_4, - &hf_resp_5, - &hf_resp_6, - &hf_resp_7, - &hf_resp_8 +static int * const *hf_resp_array[] = { + hf_resp_0, + hf_resp_1, + hf_resp_2, + hf_resp_3, + hf_resp_4, + hf_resp_5, + hf_resp_6, + hf_resp_7, + hf_resp_8 }; static guint @@ -3543,14 +3549,14 @@ dissect_tds5_capability_token(tvbuff_t *tvb, packet_info *pinfo, guint offset, } for (cap=0; cap < caplen; cap++) { - const int **hf_array = NULL; + int * const *hf_array = NULL; char name[ITEM_LABEL_LENGTH]; int ett; switch (captype) { case TDS_CAP_REQUEST: if (cap < array_length(hf_req_array)) { - hf_array = (const int **) hf_req_array[cap]; + hf_array = hf_req_array[cap]; g_snprintf(name, ITEM_LABEL_LENGTH, "Req caps %d-%d: ", cap*8, (cap + 1)*8 - 1); ett = ett_tds_capability_req; @@ -3558,7 +3564,7 @@ dissect_tds5_capability_token(tvbuff_t *tvb, packet_info *pinfo, guint offset, break; case TDS_CAP_RESPONSE: if (cap < array_length(hf_resp_array)) { - hf_array = (const int **) hf_resp_array[cap]; + hf_array = hf_resp_array[cap]; g_snprintf(name, ITEM_LABEL_LENGTH, "Resp caps %d-%d: ", cap*8, (cap + 1)*8 - 1); ett = ett_tds_capability_resp; @@ -6084,7 +6090,7 @@ dissect_tds7_colmetadata_token(tvbuff_t *tvb, struct _netlib_data *nl_data, guin * One field is not valid in this token. */ -static const int *done_status_flags[] = { +static int * const done_status_flags[] = { &hf_tds_done_status_more, &hf_tds_done_status_error, &hf_tds_done_status_inxact, @@ -6124,7 +6130,7 @@ dissect_tds_done_token(tvbuff_t *tvb, guint offset, proto_tree *tree, tds_conv_i * All fields are valid in this token. */ -static const int *doneproc_status_flags[] = { +static int * const doneproc_status_flags[] = { &hf_tds_done_status_more, &hf_tds_done_status_error, &hf_tds_done_status_inxact, @@ -6167,7 +6173,7 @@ dissect_tds_doneproc_token(tvbuff_t *tvb, guint offset, proto_tree *tree, tds_co * This token occurs much more frequently when stored procedures are used, so * it's worthwhile to make a separate list. */ -static const int *doneinproc_status_flags[] = { +static int * const doneinproc_status_flags[] = { &hf_tds_done_status_more, &hf_tds_done_status_error, &hf_tds_done_status_inxact, @@ -6810,7 +6816,7 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation_t *conv; tds_conv_info_t *tds_info; - static const int *status_flags[] = { + static int * const status_flags[] = { &hf_tds_status_eom, &hf_tds_status_ignore, &hf_tds_status_event_notif, diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 36ca4e2380..c661454b73 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1007,7 +1007,7 @@ static const value_string auth_krb5_types[] = { static void dissect_authentication_type_pair(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, proto_tree *tree) { - static const int * auth_mods[] = { + static int * const auth_mods[] = { &hf_telnet_auth_mod_enc, &hf_telnet_auth_mod_cred_fwd, &hf_telnet_auth_mod_how, diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c index 000200a8aa..49cd9a6f06 100644 --- a/epan/dissectors/packet-thread.c +++ b/epan/dissectors/packet-thread.c @@ -2009,7 +2009,7 @@ dissect_thread_nwd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case THREAD_NWD_TLV_6LOWPAN_ID: { - static const int * nwd_6lowpan_flags[] = { + static int * const nwd_6lowpan_flags[] = { &hf_thread_nwd_tlv_6lowpan_id_6co_flag_reserved, &hf_thread_nwd_tlv_6lowpan_id_6co_flag_c, &hf_thread_nwd_tlv_6lowpan_id_6co_flag_cid, diff --git a/epan/dissectors/packet-tibia.c b/epan/dissectors/packet-tibia.c index 2cb48635fa..496ca5c23e 100644 --- a/epan/dissectors/packet-tibia.c +++ b/epan/dissectors/packet-tibia.c @@ -288,7 +288,7 @@ static gint hf_tibia_char_cond_pz = -1; static gint hf_tibia_char_cond_bleeding = -1; static gint hf_tibia_char_cond_hungry = -1; -static const int *char_conds[] = { +static int * const char_conds[] = { &hf_tibia_char_cond_poisoned, &hf_tibia_char_cond_burning, &hf_tibia_char_cond_electrocuted, diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 9df57837eb..ffa3fcc171 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -1615,7 +1615,7 @@ typedef struct hf_items { int *hf_idx_p; gint *bitmask_ett_idx_p; gint length; - const gint **bitmask; + gint * const *bitmask; const gint encoding; } hf_items; @@ -1723,7 +1723,7 @@ static gint dissect_wcc(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset) { - static const gint *wcc_fields[] = { + static int * const wcc_fields[] = { &hf_tn3270_wcc_nop, &hf_tn3270_wcc_reset, &hf_tn3270_wcc_printer1, @@ -1747,7 +1747,7 @@ dissect_3270_field_validation(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offse { gint start = offset; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_field_validation_mandatory_fill, &hf_tn3270_field_validation_mandatory_entry, &hf_tn3270_field_validation_trigger, @@ -1768,7 +1768,7 @@ dissect_3270_field_attribute(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset { gint start = offset; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_fa_graphic_convert, &hf_tn3270_fa_protected, &hf_tn3270_fa_numeric, @@ -1793,7 +1793,7 @@ dissect_ccc(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset) { gint start = offset; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_ccc_coding, &hf_tn3270_ccc_printout, &hf_tn3270_ccc_start_print, @@ -2277,7 +2277,7 @@ dissect_set_msr_control(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset, { gint start = offset; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_msr_user, &hf_tn3270_msr_locked, &hf_tn3270_msr_auto, @@ -2516,7 +2516,7 @@ dissect_data_chain(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset, { gint start = offset; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_data_chain_group, &hf_tn3270_data_chain_inbound_control, NULL @@ -2849,7 +2849,7 @@ dissect_query_reply_alphanumeric(proto_tree *tn3270_tree, tvbuff_t *tvb, gint of { gint start = offset; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_ap_vertical_scrolling, &hf_tn3270_ap_horizontal_scrolling, &hf_tn3270_ap_apres1, @@ -2889,7 +2889,7 @@ dissect_query_reply_character_sets(proto_tree *tn3270_tree, tvbuff_t *tvb, gint gint start = offset; gint flagbyte1, flagbyte2; - static const gint *byte1[] = { + static int * const byte1[] = { &hf_tn3270_cs_ge, &hf_tn3270_cs_mi, &hf_tn3270_cs_lps, @@ -2901,7 +2901,7 @@ dissect_query_reply_character_sets(proto_tree *tn3270_tree, tvbuff_t *tvb, gint NULL }; - static const gint *byte2[] = { + static int * const byte2[] = { &hf_tn3270_cs_res2, &hf_tn3270_cs_pscs, &hf_tn3270_cs_res3, @@ -2909,7 +2909,7 @@ dissect_query_reply_character_sets(proto_tree *tn3270_tree, tvbuff_t *tvb, gint NULL }; - static const gint *byte3[] = { + static int * const byte3[] = { &hf_tn3270_cs_form_type1, &hf_tn3270_cs_form_type2, &hf_tn3270_cs_form_type3, @@ -2920,7 +2920,7 @@ dissect_query_reply_character_sets(proto_tree *tn3270_tree, tvbuff_t *tvb, gint NULL }; - static const gint *byte4[] = { + static int * const byte4[] = { &hf_tn3270_cs_ds_load, &hf_tn3270_cs_ds_triple, &hf_tn3270_cs_ds_char, @@ -3047,7 +3047,7 @@ dissect_query_reply_color(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset, gint i; gint np; - static const gint *byte[] = { + static int * const byte[] = { &hf_tn3270_c_prtblk, NULL }; @@ -4136,7 +4136,7 @@ dissect_query_reply_usable_area(proto_tree *tn3270_tree, tvbuff_t *tvb, gint off gint start = offset; gint vcp; - static const gint *byte1[] = { + static int * const byte1[] = { &hf_tn3270_ua_reserved1, &hf_tn3270_ua_page_printer, &hf_tn3270_ua_reserved2, @@ -4145,7 +4145,7 @@ dissect_query_reply_usable_area(proto_tree *tn3270_tree, tvbuff_t *tvb, gint off NULL }; - static const gint *byte2[] = { + static int * const byte2[] = { &hf_tn3270_ua_variable_cells, &hf_tn3270_ua_characters, &hf_tn3270_ua_cell_units, diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index e3aca3879d..056903b8b3 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -2892,7 +2892,7 @@ typedef struct hf_items { int *phf; gint bitmask_ett; int length; - const int **bitmask; + int * const *bitmask; gint encoding; } hf_items; @@ -2995,7 +2995,7 @@ static guint32 dissect_wcc(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { - static const int *wcc_byte[] = { + static int * const wcc_byte[] = { &hf_tn5250_wtd_ccc2_res, &hf_tn5250_wtd_ccc2_cursor, &hf_tn5250_wtd_ccc2_reset, @@ -3065,28 +3065,28 @@ dissect_start_of_header(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int start = offset; /*TODO: Warn on invalid length. <= 7 */ - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_soh_cursor_direction, &hf_tn5250_soh_screen_reverse, &hf_tn5250_soh_input_capable_only, NULL }; - static const int *byte1[] = { + static int * const byte1[] = { &hf_tn5250_soh_pf24, &hf_tn5250_soh_pf23, &hf_tn5250_soh_pf22, &hf_tn5250_soh_pf21, &hf_tn5250_soh_pf20, &hf_tn5250_soh_pf19, &hf_tn5250_soh_pf18, &hf_tn5250_soh_pf17, NULL }; - static const int *byte2[] = { + static int * const byte2[] = { &hf_tn5250_soh_pf16, &hf_tn5250_soh_pf15, &hf_tn5250_soh_pf14, &hf_tn5250_soh_pf13, &hf_tn5250_soh_pf12, &hf_tn5250_soh_pf11, &hf_tn5250_soh_pf10, &hf_tn5250_soh_pf9, NULL }; - static const int *byte3[] = { + static int * const byte3[] = { &hf_tn5250_soh_pf8, &hf_tn5250_soh_pf7, &hf_tn5250_soh_pf6, &hf_tn5250_soh_pf5, &hf_tn5250_soh_pf4, &hf_tn5250_soh_pf3, &hf_tn5250_soh_pf2, &hf_tn5250_soh_pf1, @@ -3142,7 +3142,7 @@ dissect_field_attribute_pair(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset int start = offset; int attribute_type; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_wea_prim_attr_flag, &hf_tn5250_wea_prim_attr_col, &hf_tn5250_wea_prim_attr_blink, &hf_tn5250_wea_prim_attr_und, &hf_tn5250_wea_prim_attr_int, &hf_tn5250_wea_prim_attr_rev, @@ -3185,7 +3185,7 @@ dissect_start_of_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int done = 0; int ffw = 0, fcw = 0, fa = 0; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_ffw_id, &hf_tn5250_ffw_bypass, &hf_tn5250_ffw_dup, @@ -3194,7 +3194,7 @@ dissect_start_of_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) NULL }; - static const int *byte1[] = { + static int * const byte1[] = { &hf_tn5250_ffw_auto, &hf_tn5250_ffw_fer, &hf_tn5250_ffw_monocase, @@ -3204,7 +3204,7 @@ dissect_start_of_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) NULL }; - static const int *fabyte[] = { + static int * const fabyte[] = { &hf_tn5250_sf_attr_flag, &hf_tn5250_wea_prim_attr_col, &hf_tn5250_wea_prim_attr_blink, &hf_tn5250_wea_prim_attr_und, &hf_tn5250_wea_prim_attr_int, &hf_tn5250_wea_prim_attr_rev, @@ -3272,7 +3272,7 @@ dissect_create_window(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int length = 0; int done = 0, minor_structure = 0; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_wdsf_cw_flag1_1, &hf_tn5250_wdsf_cw_flag1_2, &hf_tn5250_wdsf_cw_flag1_reserved, @@ -3288,7 +3288,7 @@ dissect_create_window(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *cw_bp_flag1[] = { + static int * const cw_bp_flag1[] = { &hf_tn5250_wdsf_cw_bp_flag1_1, &hf_tn5250_wdsf_cw_bp_flag1_reserved, NULL @@ -3312,7 +3312,7 @@ dissect_create_window(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *cw_tf_flag1[] = { + static int * const cw_tf_flag1[] = { &hf_tn5250_wdsf_cw_tf_flag_orientation, &hf_tn5250_wdsf_cw_tf_flag_1, &hf_tn5250_wdsf_cw_tf_flag_reserved, @@ -3366,13 +3366,13 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int done = 0, minor_structure = 0, digit_selection = 0; int minor_structure_start; - static const int *ds_flag1[] = { + static int * const ds_flag1[] = { &hf_tn5250_wdsf_ds_flag1_mouse_characteristics, &hf_tn5250_wdsf_ds_flag1_reserved, &hf_tn5250_wdsf_ds_flag1_auto_enter, &hf_tn5250_wdsf_ds_flag1_1, &hf_tn5250_wdsf_ds_flag1_2, NULL }; - static const int *ds_flag2[] = { + static int * const ds_flag2[] = { &hf_tn5250_wdsf_ds_flag2_1, &hf_tn5250_wdsf_ds_flag2_2, &hf_tn5250_wdsf_ds_flag2_3, &hf_tn5250_wdsf_ds_flag2_4, &hf_tn5250_wdsf_ds_flag2_5, &hf_tn5250_wdsf_ds_flag2_6, @@ -3380,18 +3380,18 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) NULL }; - static const int *ds_flag3[] = { + static int * const ds_flag3[] = { &hf_tn5250_wdsf_ds_flag3_1, &hf_tn5250_wdsf_ds_flag3_reserved, NULL }; - static const int *ds_gdc[] = { + static int * const ds_gdc[] = { &hf_tn5250_wdsf_ds_gdc_indicators, &hf_tn5250_wdsf_ds_gdc_reserved, &hf_tn5250_wdsf_ds_gdc_selection_techniques, NULL }; - static const int *ds_nws[] = { + static int * const ds_nws[] = { &hf_tn5250_wdsf_ds_nws_indicators, &hf_tn5250_wdsf_ds_nws_reserved, &hf_tn5250_wdsf_ds_nws_selection_techniques, NULL @@ -3419,14 +3419,14 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *ds_ct_flag1[] = { + static int * const ds_ct_flag1[] = { &hf_tn5250_wdsf_ds_ct_flag1_choice_state, &hf_tn5250_wdsf_ds_ct_flag1_2, &hf_tn5250_wdsf_ds_ct_flag1_3, &hf_tn5250_wdsf_ds_ct_flag1_4, &hf_tn5250_wdsf_ds_ct_flag1_5, &hf_tn5250_wdsf_ds_ct_flag1_numeric_selection, NULL }; - static const int *ds_ct_flag2[] = { + static int * const ds_ct_flag2[] = { &hf_tn5250_wdsf_ds_ct_flag2_0, &hf_tn5250_wdsf_ds_ct_flag2_1, &hf_tn5250_wdsf_ds_ct_flag2_2, &hf_tn5250_wdsf_ds_ct_flag2_3, &hf_tn5250_wdsf_ds_ct_flag2_4, &hf_tn5250_wdsf_ds_ct_flag2_5, @@ -3434,7 +3434,7 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) NULL }; - static const int *ds_ct_flag3[] = { + static int * const ds_ct_flag3[] = { &hf_tn5250_wdsf_ds_ct_flag3_0, &hf_tn5250_wdsf_ds_ct_flag3_1, &hf_tn5250_wdsf_ds_ct_flag3_2, &hf_tn5250_wdsf_ds_ct_flag3_reserved, NULL @@ -3453,7 +3453,7 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *ds_mbs_flag[] = { + static int * const ds_mbs_flag[] = { &hf_tn5250_wdsf_ds_mbs_flag_0, &hf_tn5250_wdsf_ds_mbs_flag_1, &hf_tn5250_wdsf_ds_mbs_flag_reserved, NULL @@ -3472,7 +3472,7 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *ds_cpda_flag[] = { + static int * const ds_cpda_flag[] = { &hf_tn5250_wdsf_ds_cpda_flag1_0, &hf_tn5250_wdsf_ds_cpda_flag1_1, &hf_tn5250_wdsf_ds_cpda_flag1_2, &hf_tn5250_wdsf_ds_cpda_flag1_reserved, NULL @@ -3501,7 +3501,7 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *ds_ci_flag[] = { + static int * const ds_ci_flag[] = { &hf_tn5250_wdsf_ds_ci_flag1_0, &hf_tn5250_wdsf_ds_ci_flag1_reserved, NULL }; @@ -3516,7 +3516,7 @@ dissect_define_selection(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *ds_sbi_flag[] = { + static int * const ds_sbi_flag[] = { &hf_tn5250_wdsf_ds_sbi_flag1_0, &hf_tn5250_wdsf_ds_sbi_flag1_reserved, NULL }; @@ -3594,7 +3594,7 @@ dissect_define_scrollbar(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int start = offset; int done = 0, minor_structure = 0; - static const int *dsb_byte[] = { + static int * const dsb_byte[] = { &hf_tn5250_wdsf_dsb_flag1_0, &hf_tn5250_wdsf_dsb_flag1_1, &hf_tn5250_wdsf_dsb_flag1_reserved, &hf_tn5250_wdsf_dsb_flag1_7, NULL @@ -3609,7 +3609,7 @@ dissect_define_scrollbar(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { NULL, 0, 0, 0, 0 } }; - static const int *ds_sbi_flag[] = { + static int * const ds_sbi_flag[] = { &hf_tn5250_wdsf_ds_sbi_flag1_0, &hf_tn5250_wdsf_ds_sbi_flag1_reserved, NULL }; @@ -3652,12 +3652,12 @@ dissect_draw_erase_gridlines(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset int start = offset; int done = 0, minor_structure=0; - static const int *deg_byte[] = { + static int * const deg_byte[] = { &hf_tn5250_wdsf_deg_flag1_0, &hf_tn5250_wdsf_deg_flag1_reserved, NULL }; - static const int *deg_byte2[] = { + static int * const deg_byte2[] = { &hf_tn5250_wdsf_deg_flag2_0, &hf_tn5250_wdsf_deg_flag2_reserved, NULL }; @@ -3674,7 +3674,7 @@ dissect_draw_erase_gridlines(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset }; - static const int *deg_ms_byte[] = { + static int * const deg_ms_byte[] = { &hf_tn5250_wdsf_deg_ms_flag1_0, &hf_tn5250_wdsf_deg_ms_flag1_reserved, NULL }; @@ -3731,7 +3731,7 @@ dissect_wdsf_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offse { NULL, 0, 0, 0, 0 } }; - static const int *rgw_byte[] = { + static int * const rgw_byte[] = { &hf_tn5250_wdsf_rgw_flag1_0, &hf_tn5250_wdsf_rgw_flag1_1, &hf_tn5250_wdsf_rgw_reserved, @@ -3745,7 +3745,7 @@ dissect_wdsf_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offse { NULL, 0, 0, 0, 0 } }; - static const int *ragc_byte[] = { + static int * const ragc_byte[] = { &hf_tn5250_wdsf_ragc_flag1_0, &hf_tn5250_wdsf_ragc_reserved, NULL @@ -3758,7 +3758,7 @@ dissect_wdsf_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offse { NULL, 0, 0, 0, 0 } }; - static const int *wdf_byte[] = { + static int * const wdf_byte[] = { &hf_tn5250_wdsf_wdf_flag1_0, &hf_tn5250_wdsf_wdf_flag1_reserved, NULL @@ -3770,7 +3770,7 @@ dissect_wdsf_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offse { NULL, 0, 0, 0, 0 } }; - static const int *pmb_byte[] = { + static int * const pmb_byte[] = { &hf_tn5250_wdsf_pmb_flag1_0, &hf_tn5250_wdsf_pmb_flag1_1, &hf_tn5250_wdsf_pmb_flag1_2, &hf_tn5250_wdsf_pmb_flag1_3, &hf_tn5250_wdsf_pmb_flag1_reserved, @@ -3995,7 +3995,7 @@ dissect_save_partial_screen(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int start = offset; int length = 0; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_sps_flag1_0, &hf_tn5250_sps_flag1_reserved, NULL @@ -4027,7 +4027,7 @@ dissect_roll(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { int start = offset; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_roll_flag1_0, &hf_tn5250_roll_flag1_reserved, &hf_tn5250_roll_flag1_lines, @@ -4056,7 +4056,7 @@ dissect_write_single_structured_field_minor_fields(proto_tree *tn5250_tree, int start = offset; int done = 0, type = 0; - static const int *byte_wssf_kbc_flag1[] = { + static int * const byte_wssf_kbc_flag1[] = { &hf_tn5250_wssf_kbc_flag1_reserved, &hf_tn5250_wssf_kbc_flag1_5, &hf_tn5250_wssf_kbc_flag1_6, @@ -4064,7 +4064,7 @@ dissect_write_single_structured_field_minor_fields(proto_tree *tn5250_tree, NULL }; - static const int *byte_wssf_cc_flag1[] = { + static int * const byte_wssf_cc_flag1[] = { &hf_tn5250_wssf_cc_flag1_reserved, &hf_tn5250_wssf_cc_flag1_7, NULL @@ -4113,7 +4113,7 @@ dissect_write_single_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, int length, type, done = 0; guint32 namelength; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_wssf_flag2_0, &hf_tn5250_wssf_flag2_1, &hf_tn5250_wssf_flag2_2, @@ -4125,7 +4125,7 @@ dissect_write_single_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, NULL }; - static const int *ifc_byte[] = { + static int * const ifc_byte[] = { &hf_tn5250_wssf_ifc_flag1_0, &hf_tn5250_wssf_ifc_flag1_1to3, &hf_tn5250_wssf_ifc_flag1_4, @@ -4135,7 +4135,7 @@ dissect_write_single_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, NULL }; - static const int *ifc_byte2[] = { + static int * const ifc_byte2[] = { &hf_tn5250_wssf_ifc_flag2_0, &hf_tn5250_wssf_ifc_flag2_1, &hf_tn5250_wssf_ifc_flag2_reserved, @@ -4143,7 +4143,7 @@ dissect_write_single_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, NULL }; - static const int *ifd_byte[] = { + static int * const ifd_byte[] = { &hf_tn5250_wssf_ifd_flag1_0, &hf_tn5250_wssf_ifd_flag1_reserved, NULL @@ -4270,13 +4270,13 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *qss_byte1[] = { + static int * const qss_byte1[] = { &hf_tn5250_wsf_qss_flag1_0, &hf_tn5250_wsf_qss_flag1_reserved, NULL }; - static const int *qss_byte2[] = { + static int * const qss_byte2[] = { &hf_tn5250_wsf_qss_flag2_reserved, &hf_tn5250_wsf_qss_flag2_7, NULL @@ -4301,7 +4301,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *rts_byte1[] = { + static int * const rts_byte1[] = { &hf_tn5250_rts_flag1_0, &hf_tn5250_rts_flag1_reserved, NULL @@ -4315,7 +4315,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *dpo_byte1[] = { + static int * const dpo_byte1[] = { &hf_tn5250_dpo_flag1_0, &hf_tn5250_dpo_flag1_1, &hf_tn5250_dpo_flag1_2, @@ -4327,7 +4327,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *dpo_byte2[] = { + static int * const dpo_byte2[] = { &hf_tn5250_dpo_flag2_0, &hf_tn5250_dpo_flag2_reserved, NULL @@ -4343,7 +4343,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *dtsf_byte1[] = { + static int * const dtsf_byte1[] = { &hf_tn5250_dtsf_flag1_0, &hf_tn5250_dtsf_flag1_1, &hf_tn5250_dtsf_flag1_2, @@ -4355,7 +4355,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *dtsf_byte2[] = { + static int * const dtsf_byte2[] = { &hf_tn5250_dtsf_flag2_0, &hf_tn5250_dtsf_flag2_1, &hf_tn5250_dtsf_flag2_2, @@ -4376,7 +4376,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *dsl_byte1[] = { + static int * const dsl_byte1[] = { &hf_tn5250_dsl_flag1_0, &hf_tn5250_dsl_flag1_1, &hf_tn5250_dsl_flag1_2, @@ -4401,7 +4401,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *wts_byte1[] = { + static int * const wts_byte1[] = { &hf_tn5250_wts_flag1_0, &hf_tn5250_wts_flag1_1, &hf_tn5250_wts_flag1_2, @@ -4410,14 +4410,14 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *wts_byte2[] = { + static int * const wts_byte2[] = { &hf_tn5250_wts_flag2_reserved, &hf_tn5250_wts_flag2_6, &hf_tn5250_wts_flag2_reserved2, NULL }; - static const int *wts_byte3[] = { + static int * const wts_byte3[] = { &hf_tn5250_wts_flag3_0, &hf_tn5250_wts_flag3_1, &hf_tn5250_wts_flag3_2, @@ -4439,7 +4439,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs { NULL, 0, 0, 0, 0 } }; - static const int *wts_cld_byte1[] = { + static int * const wts_cld_byte1[] = { &hf_tn5250_wts_cld_flag1_0, &hf_tn5250_wts_cld_flag1_1, &hf_tn5250_wts_cld_flag1_2, @@ -4451,7 +4451,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *wts_cld_byte2[] = { + static int * const wts_cld_byte2[] = { &hf_tn5250_wts_cld_flag2_0, &hf_tn5250_wts_cld_flag2_1, &hf_tn5250_wts_cld_flag2_2, @@ -4461,7 +4461,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *wts_cld_byte3[] = { + static int * const wts_cld_byte3[] = { &hf_tn5250_wts_cld_flag3_0, &hf_tn5250_wts_cld_flag3_1, &hf_tn5250_wts_cld_flag3_2, @@ -4503,7 +4503,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs }; - static const int *dfdpck_coreflag[] = { + static int * const dfdpck_coreflag[] = { &hf_tn5250_dfdpck_coreflag_0, &hf_tn5250_dfdpck_coreflag_1, &hf_tn5250_dfdpck_coreflag_2, @@ -4515,7 +4515,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *dfdpck_toprowflag1[] = { + static int * const dfdpck_toprowflag1[] = { &hf_tn5250_dfdpck_toprowflag1_0, &hf_tn5250_dfdpck_toprowflag1_1, &hf_tn5250_dfdpck_toprowflag1_2, @@ -4527,7 +4527,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *dfdpck_toprowflag2[] = { + static int * const dfdpck_toprowflag2[] = { &hf_tn5250_dfdpck_toprowflag2_0, &hf_tn5250_dfdpck_toprowflag2_1, &hf_tn5250_dfdpck_toprowflag2_2, @@ -4539,7 +4539,7 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs NULL }; - static const int *dfdpck_toprowflag3[] = { + static int * const dfdpck_toprowflag3[] = { &hf_tn5250_dfdpck_toprowflag3_0, &hf_tn5250_dfdpck_toprowflag3_1, &hf_tn5250_dfdpck_toprowflag3_2, @@ -4740,13 +4740,13 @@ dissect_query_reply(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) { int start = offset; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_qr_flag_0, &hf_tn5250_qr_flag_reserved, NULL }; - static const int *byte1[] = { + static int * const byte1[] = { &hf_tn5250_qr_flag1_0, &hf_tn5250_qr_flag1_1, &hf_tn5250_qr_flag1_2, @@ -4758,7 +4758,7 @@ dissect_query_reply(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) NULL }; - static const int *byte2[] = { + static int * const byte2[] = { &hf_tn5250_qr_flag2_0to3, &hf_tn5250_qr_flag2_4, &hf_tn5250_qr_flag2_5, @@ -4831,7 +4831,7 @@ dissect_tn5250_header(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset) int start=offset; int error_flag; - static const int *byte[] = { + static int * const byte[] = { &hf_tn5250_ds_output_error, &hf_tn5250_attn_key, &hf_tn5250_sys_request_key, diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index bfecebf095..ba17fdd95a 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -209,7 +209,7 @@ static gint ett_sql = -1; #define TCP_PORT_TNS 1521 /* Not IANA registered */ -static const int * tns_connect_flags[] = { +static int * const tns_connect_flags[] = { &hf_tns_conn_flag_nareq, &hf_tns_conn_flag_nalink, &hf_tns_conn_flag_enablena, @@ -218,7 +218,7 @@ static const int * tns_connect_flags[] = { NULL }; -static const int * tns_service_options[] = { +static int * const tns_service_options[] = { &hf_tns_sopt_flag_bconn, &hf_tns_sopt_flag_pc, &hf_tns_sopt_flag_hc, @@ -494,7 +494,7 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, prot proto_tree *data_tree; guint data_func_id; gboolean is_request; - static const int * flags[] = { + static int * const flags[] = { &hf_tns_data_flag_send, &hf_tns_data_flag_rc, &hf_tns_data_flag_c, @@ -848,7 +848,7 @@ static void dissect_tns_connect(tvbuff_t *tvb, int offset, packet_info *pinfo _U proto_tree *connect_tree; guint32 cd_offset, cd_len; int tns_offset = offset-8; - static const int * flags[] = { + static int * const flags[] = { &hf_tns_ntp_flag_hangon, &hf_tns_ntp_flag_crel, &hf_tns_ntp_flag_tduio, diff --git a/epan/dissectors/packet-tpm20.c b/epan/dissectors/packet-tpm20.c index 1c40405add..9193c9a34a 100644 --- a/epan/dissectors/packet-tpm20.c +++ b/epan/dissectors/packet-tpm20.c @@ -626,7 +626,7 @@ dissect_auth_common(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *auth, proto_tree *tree _U_, gint *offset) { guint nonce_size, auth_size; - const int *attrib_fields[] = { + static int * const attrib_fields[] = { &hf_session_attribs_cont, &hf_session_attribs_auditex, &hf_session_attribs_auditreset, diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 33137c8582..78f98605b7 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -529,14 +529,14 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* protocol analysis tree */ if (tree) { - static const int * ac[] = { + static int * const ac[] = { &hf_tr_priority, &hf_tr_frame, &hf_tr_monitor_cnt, &hf_tr_priority_reservation, NULL }; - static const int * fc_flags[] = { + static int * const fc_flags[] = { &hf_tr_fc_type, &hf_tr_fc_pcf, NULL diff --git a/epan/dissectors/packet-twamp.c b/epan/dissectors/packet-twamp.c index 581d0f824a..ac4a62ab40 100644 --- a/epan/dissectors/packet-twamp.c +++ b/epan/dissectors/packet-twamp.c @@ -490,7 +490,7 @@ dissect_twamp_server_greeting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre return tvb_captured_length(tvb); } -static const int * twamp_error_estimate_flags[] = { +static int * const twamp_error_estimate_flags[] = { &hf_twamp_error_estimate_b15, &hf_twamp_error_estimate_b14, &hf_twamp_error_estimate_scale, diff --git a/epan/dissectors/packet-u3v.c b/epan/dissectors/packet-u3v.c index 46ab30458c..8428b20aa9 100644 --- a/epan/dissectors/packet-u3v.c +++ b/epan/dissectors/packet-u3v.c @@ -1023,7 +1023,7 @@ static const value_string u3v_descriptor_subtypes[] = { 0, NULL } }; -static const int *speed_support_fields[] = { +static int * const speed_support_fields[] = { &hf_u3v_device_info_descriptor_bmSpeedSupport_low_speed, &hf_u3v_device_info_descriptor_bmSpeedSupport_full_speed, &hf_u3v_device_info_descriptor_bmSpeedSupport_high_speed, diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 2fb7cf2d62..a07f2a1dda 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -2445,7 +2445,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } case 0x04: /* Start Beep */ { - static const int *destinations[] = { + static int * const destinations[] = { &hf_ua3g_beep_beep_destination_handset, &hf_ua3g_beep_beep_destination_headset, &hf_ua3g_beep_beep_destination_loudspeaker, @@ -3795,7 +3795,7 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, offset++; length--; } else { - static const int *hardware_config[] = { + static int * const hardware_config[] = { &hf_ua3g_unsolicited_msg_hardware_config_export_full, &hf_ua3g_unsolicited_msg_hardware_config_ethernet_hardware, &hf_ua3g_unsolicited_msg_hardware_config_extended_edition, @@ -3851,7 +3851,7 @@ decode_unsolicited_msg(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } if (length >= 1) { - const int *capability_info[] = { + int * const capability_info[] = { &hf_ua3g_unsolicited_msg_capability_info_vpn, &hf_ua3g_unsolicited_msg_capability_info_ipsec, &hf_ua3g_unsolicited_msg_capability_info_dtls, @@ -3972,7 +3972,7 @@ static void decode_special_key(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset, guint8 opcode) { - static const int * special_keys[] = { + static int * const special_keys[] = { &hf_ua3g_special_key_shift, &hf_ua3g_special_key_ctrl, &hf_ua3g_special_key_alt, diff --git a/epan/dissectors/packet-uftp.c b/epan/dissectors/packet-uftp.c index e7923e2b23..f0402d5e1e 100644 --- a/epan/dissectors/packet-uftp.c +++ b/epan/dissectors/packet-uftp.c @@ -429,7 +429,7 @@ static const value_string file_types[] = { { 0, NULL } }; -static const int *announce_flags[] = { +static int * const announce_flags[] = { &hf_uftp_announce_flags_restart, &hf_uftp_announce_flags_sync, &hf_uftp_announce_flags_syncpreview, @@ -437,13 +437,13 @@ static const int *announce_flags[] = { NULL }; -static const int *infoack_flags[] = { +static int * const infoack_flags[] = { &hf_uftp_infoack_flags_partial, &hf_uftp_infoack_flags_reserved, NULL }; -static const int *abort_flags[] = { +static int * const abort_flags[] = { &hf_uftp_abort_flags_curfile, &hf_uftp_abort_flags_reserved, NULL diff --git a/epan/dissectors/packet-uftp4.c b/epan/dissectors/packet-uftp4.c index 4fa5a855d0..5ce7838443 100644 --- a/epan/dissectors/packet-uftp4.c +++ b/epan/dissectors/packet-uftp4.c @@ -676,7 +676,7 @@ static const value_string file_types[] = { { 0, NULL } }; -static const int *announce_flags[] = { +static int * const announce_flags[] = { &hf_uftp_announce_flags_sync, &hf_uftp_announce_flags_syncpreview, &hf_uftp_announce_flags_ipv6, @@ -684,25 +684,25 @@ static const int *announce_flags[] = { NULL }; -static const int *encinfo_flags[] = { +static int * const encinfo_flags[] = { &hf_uftp_encinfo_flags_client_auth, &hf_uftp_encinfo_flags_reserved, NULL }; -static const int *fileinfoack_flags[] = { +static int * const fileinfoack_flags[] = { &hf_uftp_fileinfoack_flags_partial, &hf_uftp_fileinfoack_flags_reserved, NULL }; -static const int *abort_flags[] = { +static int * const abort_flags[] = { &hf_uftp_abort_flags_curfile, &hf_uftp_abort_flags_reserved, NULL }; -static const int *cc_item_flags[] = { +static int * const cc_item_flags[] = { &hf_uftp_congctrl_item_flags_clr, &hf_uftp_congctrl_item_flags_rtt, &hf_uftp_congctrl_item_flags_start, @@ -711,7 +711,7 @@ static const int *cc_item_flags[] = { NULL }; -static const int *tfmcc_ack_flags[] = { +static int * const tfmcc_ack_flags[] = { &hf_uftp_tfmccack_flags_clr, &hf_uftp_tfmccack_flags_rtt, &hf_uftp_tfmccack_flags_start, diff --git a/epan/dissectors/packet-uftp5.c b/epan/dissectors/packet-uftp5.c index d737456813..a524994fde 100644 --- a/epan/dissectors/packet-uftp5.c +++ b/epan/dissectors/packet-uftp5.c @@ -650,7 +650,7 @@ static const value_string file_types[] = { { 0, NULL } }; -static const int *announce_flags[] = { +static int * const announce_flags[] = { &hf_uftp_announce_flags_sync, &hf_uftp_announce_flags_syncpreview, &hf_uftp_announce_flags_ipv6, @@ -658,25 +658,25 @@ static const int *announce_flags[] = { NULL }; -static const int *encinfo_flags[] = { +static int * const encinfo_flags[] = { &hf_uftp_encinfo_flags_client_auth, &hf_uftp_encinfo_flags_reserved, NULL }; -static const int *fileinfoack_flags[] = { +static int * const fileinfoack_flags[] = { &hf_uftp_fileinfoack_flags_partial, &hf_uftp_fileinfoack_flags_reserved, NULL }; -static const int *abort_flags[] = { +static int * const abort_flags[] = { &hf_uftp_abort_flags_curfile, &hf_uftp_abort_flags_reserved, NULL }; -static const int *cc_item_flags[] = { +static int * const cc_item_flags[] = { &hf_uftp_congctrl_item_flags_clr, &hf_uftp_congctrl_item_flags_rtt, &hf_uftp_congctrl_item_flags_start, @@ -685,7 +685,7 @@ static const int *cc_item_flags[] = { NULL }; -static const int *tfmcc_ack_flags[] = { +static int * const tfmcc_ack_flags[] = { &hf_uftp_tfmccack_flags_clr, &hf_uftp_tfmccack_flags_rtt, &hf_uftp_tfmccack_flags_start, diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index f3c4efda33..088dbc3293 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -2404,7 +2404,7 @@ dissect_ulp_GANSSPositioningMethodTypes(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const int * GANSSSignals_bits[] = { +static int * const GANSSSignals_bits[] = { &hf_ulp_GANSSSignals_signal1, &hf_ulp_GANSSSignals_signal2, &hf_ulp_GANSSSignals_signal3, @@ -2486,7 +2486,7 @@ dissect_ulp_T_addPosID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const int * T_addPosMode_bits[] = { +static int * const T_addPosMode_bits[] = { &hf_ulp_T_addPosMode_standalone, &hf_ulp_T_addPosMode_setBased, &hf_ulp_T_addPosMode_setAssisted, diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c index 0469b818db..cda824bb75 100644 --- a/epan/dissectors/packet-usb-audio.c +++ b/epan/dissectors/packet-usb-audio.c @@ -851,7 +851,7 @@ dissect_ac_if_hdr_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, guint8 if_in_collection, i; audio_conv_info_t *audio_conv_info; - static const int *bm_controls[] = { + static int * const bm_controls[] = { &hf_ac_if_hdr_controls_latency, &hf_ac_if_hdr_controls_rsv, NULL @@ -918,7 +918,7 @@ dissect_ac_if_input_terminal(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, audio_conv_info_t *audio_conv_info; gint offset_start; - static const int *input_wchannelconfig[] = { + static int * const input_wchannelconfig[] = { &hf_ac_if_input_wchannelconfig_d0, &hf_ac_if_input_wchannelconfig_d1, &hf_ac_if_input_wchannelconfig_d2, @@ -935,7 +935,7 @@ dissect_ac_if_input_terminal(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, NULL }; - static const int *input_bmchannelconfig[] = { + static int * const input_bmchannelconfig[] = { &hf_ac_if_input_bmchannelconfig_d0, &hf_ac_if_input_bmchannelconfig_d1, &hf_ac_if_input_bmchannelconfig_d2, @@ -968,7 +968,7 @@ dissect_ac_if_input_terminal(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, NULL }; - static const int *controls[] = { + static int * const controls[] = { &hf_ac_if_input_controls_copy, &hf_ac_if_input_controls_connector, &hf_ac_if_input_controls_overload, @@ -1036,7 +1036,7 @@ dissect_ac_if_output_terminal(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_ audio_conv_info_t *audio_conv_info; gint offset_start; - static const int *controls[] = { + static int * const controls[] = { &hf_ac_if_output_controls_copy, &hf_ac_if_output_controls_connector, &hf_ac_if_output_controls_overload, @@ -1094,7 +1094,7 @@ dissect_ac_if_feature_unit(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *bitmap_tree; proto_item *ti; - static const int *fu_controls0[] = { + static int * const fu_controls0[] = { &hf_ac_if_fu_controls_d0, &hf_ac_if_fu_controls_d1, &hf_ac_if_fu_controls_d2, @@ -1105,7 +1105,7 @@ dissect_ac_if_feature_unit(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, &hf_ac_if_fu_controls_d7, NULL }; - static const int *fu_controls1[] = { + static int * const fu_controls1[] = { &hf_ac_if_fu_controls_d8, &hf_ac_if_fu_controls_d9, &hf_ac_if_fu_controls_rsv, @@ -1190,7 +1190,7 @@ dissect_ac_if_mixed_unit(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, gint offset_start; guint8 nrinpins; - static const int *mu_channelconfig[] = { + static int * const mu_channelconfig[] = { &hf_ac_if_mu_channelconfig_d0, &hf_ac_if_mu_channelconfig_d1, &hf_ac_if_mu_channelconfig_d2, @@ -1245,13 +1245,13 @@ dissect_ac_if_clock_source(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree, usb_conv_info_t *usb_conv_info _U_) { gint offset_start; - static const int *cs_attributes[] = { + static int * const cs_attributes[] = { &hf_ac_if_clksrc_attr_type, &hf_ac_if_clksrc_attr_d2, &hf_ac_if_clksrc_attr_rsv, NULL }; - static const int *cs_controls[] = { + static int * const cs_controls[] = { &hf_ac_if_clksrc_controls_freq, &hf_ac_if_clksrc_controls_validity, &hf_ac_if_clksrc_controls_rsv, @@ -1283,7 +1283,7 @@ dissect_ac_if_clock_selector(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, { gint offset_start; guint8 nrinpins; - static const int *cs_controls[] = { + static int * const cs_controls[] = { &hf_ac_if_clksel_controls_clksel, &hf_ac_if_clksel_controls_rsv, NULL @@ -1319,14 +1319,14 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, audio_conv_info_t *audio_conv_info; gint offset_start; - static const int *v2_controls[] = { + static int * const v2_controls[] = { &hf_as_if_gen_controls_active, &hf_as_if_gen_controls_valid, &hf_as_if_gen_controls_rsv, NULL }; - static const int *v2_formats_type_i[] = { + static int * const v2_formats_type_i[] = { &hf_as_if_gen_formats_i_d0, &hf_as_if_gen_formats_i_d1, &hf_as_if_gen_formats_i_d2, @@ -1337,7 +1337,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, NULL }; - static const int *v2_formats_type_ii[] = { + static int * const v2_formats_type_ii[] = { &hf_as_if_gen_formats_ii_d0, &hf_as_if_gen_formats_ii_d1, &hf_as_if_gen_formats_ii_d2, @@ -1347,7 +1347,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, NULL }; - static const int *v2_formats_type_iii[] = { + static int * const v2_formats_type_iii[] = { &hf_as_if_gen_formats_iii_d0, &hf_as_if_gen_formats_iii_d1, &hf_as_if_gen_formats_iii_d2, @@ -1365,7 +1365,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, NULL }; - static const int *v2_formats_type_iv[] = { + static int * const v2_formats_type_iv[] = { &hf_as_if_gen_formats_iv_d0, &hf_as_if_gen_formats_iv_d1, &hf_as_if_gen_formats_iv_d2, @@ -1392,7 +1392,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, NULL }; - static const int *v2_channels[] = { + static int * const v2_channels[] = { &hf_as_if_gen_bmchannelconfig_d0, &hf_as_if_gen_bmchannelconfig_d1, &hf_as_if_gen_bmchannelconfig_d2, @@ -1441,7 +1441,7 @@ dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, offset += 2; } else if (audio_conv_info->audio_ver_major==2) { guint8 format_type; - const int **formats_bitmask; + int * const *formats_bitmask; proto_tree_add_item(tree, hf_as_if_gen_term_link, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; @@ -1653,18 +1653,18 @@ dissect_as_ep_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, audio_conv_info_t *audio_conv_info; gint offset_start = offset; - static const int *v1_attributes[] = { + static int * const v1_attributes[] = { &hf_as_ep_gen_bmattributes_d0, &hf_as_ep_gen_bmattributes_d1, &hf_as_ep_gen_bmattributes_rsv, &hf_as_ep_gen_bmattributes_d7, NULL }; - static const int *v2_attributes[] = { + static int * const v2_attributes[] = { &hf_as_ep_gen_bmattributes_d7, NULL }; - static const int *controls[] = { + static int * const controls[] = { &hf_as_ep_gen_controls_pitch, &hf_as_ep_gen_controls_data_overrun, &hf_as_ep_gen_controls_data_underrun, diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c index f166d6f223..b977f49ffc 100644 --- a/epan/dissectors/packet-usb-ccid.c +++ b/epan/dissectors/packet-usb-ccid.c @@ -97,20 +97,20 @@ static int hf_ccid_bHardwareErrorCode = -1; static dissector_handle_t usb_ccid_handle; -static const int *bVoltageLevel_fields[] = { +static int * const bVoltageLevel_fields[] = { &hf_ccid_bVoltageSupport18, &hf_ccid_bVoltageSupport30, &hf_ccid_bVoltageSupport50, NULL }; -static const int *dwProtocols_fields[] = { +static int * const dwProtocols_fields[] = { &hf_ccid_dwProtocols_t0, &hf_ccid_dwProtocols_t1, NULL }; -static const int *bFeatures_fields[] = { +static int * const bFeatures_fields[] = { /* XXX - add the missing components */ &hf_ccid_dwFeatures_autoParam, &hf_ccid_dwFeatures_autoIccActivation, @@ -129,13 +129,13 @@ static const int *bFeatures_fields[] = { NULL }; -static const int *bPINSupport_fields[] = { +static int * const bPINSupport_fields[] = { &hf_ccid_bPINSupport_modify, &hf_ccid_bPINSupport_vrfy, NULL }; -static const int *bmSlotICCState_fields[] = { +static int * const bmSlotICCState_fields[] = { &hf_ccid_bmSlotICCState_slot0Current, &hf_ccid_bmSlotICCState_slot0Changed, &hf_ccid_bmSlotICCState_slot1Current, @@ -147,7 +147,7 @@ static const int *bmSlotICCState_fields[] = { NULL }; -static const int *bStatus_fields[] = { +static int * const bStatus_fields[] = { &hf_ccid_bStatus_bmIccStatus, &hf_ccid_bStatus_bmCommandStatus, NULL diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c index 2785469e29..fc92454d8c 100644 --- a/epan/dissectors/packet-usb-com.c +++ b/epan/dissectors/packet-usb-com.c @@ -315,7 +315,7 @@ static const value_string usb_com_setup_request_vals[] = { }; static value_string_ext usb_com_setup_request_vals_ext = VALUE_STRING_EXT_INIT(usb_com_setup_request_vals); -static const int *usb_com_get_ntb_params_ntb_formats_supported_fields[] = { +static int * const usb_com_get_ntb_params_ntb_formats_supported_fields[] = { &hf_usb_com_get_ntb_params_ntb_formats_supported_16bit, &hf_usb_com_get_ntb_params_ntb_formats_supported_32bit, NULL @@ -333,7 +333,7 @@ static const value_string usb_com_crc_mode_vals[] = { {0, NULL} }; -static const int *ecm_eth_stats[] = { +static int * const ecm_eth_stats[] = { &hf_usb_com_descriptor_ecm_eth_stats_reserved, &hf_usb_com_descriptor_ecm_eth_stats_xmit_late_collisions, &hf_usb_com_descriptor_ecm_eth_stats_xmit_times_crs_lost, @@ -372,7 +372,7 @@ static const true_false_string usb_com_ecm_mc_address_filtering = { "Perfect" }; -static const int *ecm_nb_mc_filters[] = { +static int * const ecm_nb_mc_filters[] = { &hf_usb_com_descriptor_ecm_nb_mc_filters_mc_address_filtering, &hf_usb_com_descriptor_ecm_nb_mc_filters_nb_filters_supported, NULL diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c index ffca5994b8..48fc795ce2 100644 --- a/epan/dissectors/packet-usb-hub.c +++ b/epan/dissectors/packet-usb-hub.c @@ -329,7 +329,7 @@ dissect_usb_hub_get_port_status(packet_info *pinfo, proto_tree *tree, tvbuff_t * /* length shall always contain 4 */ /*offset += 2;*/ } else { - static const int *status_fields[] = { + static int * const status_fields[] = { &hf_usb_hub_port_status_connection, &hf_usb_hub_port_status_enable, &hf_usb_hub_port_status_suspend, @@ -343,7 +343,7 @@ dissect_usb_hub_get_port_status(packet_info *pinfo, proto_tree *tree, tvbuff_t * NULL }; - static const int *change_fields[] = { + static int * const change_fields[] = { &hf_usb_hub_port_change_connection, &hf_usb_hub_port_change_enable, &hf_usb_hub_port_change_suspend, diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c index 637bf1225c..544e67ca39 100644 --- a/epan/dissectors/packet-usb-video.c +++ b/epan/dissectors/packet-usb-video.c @@ -673,7 +673,7 @@ typedef struct _video_conv_info_t { */ static int dissect_bmControl(proto_tree *tree, tvbuff_t *tvb, int offset, - gint ett_subtree, const int** bm_items) + gint ett_subtree, int * const *bm_items) { guint8 bm_size = 0; @@ -699,7 +699,7 @@ dissect_bmControl(proto_tree *tree, tvbuff_t *tvb, int offset, static int dissect_usb_video_camera_terminal(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *control_bits[] = { + static int * const control_bits[] = { &hf_usb_vid_cam_control_D[0], &hf_usb_vid_cam_control_D[1], &hf_usb_vid_cam_control_D[2], @@ -743,7 +743,7 @@ dissect_usb_video_camera_terminal(proto_tree *tree, tvbuff_t *tvb, int offset) static int dissect_usb_video_processing_unit(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *control_bits[] = { + static int * const control_bits[] = { &hf_usb_vid_proc_control_D[0], &hf_usb_vid_proc_control_D[1], &hf_usb_vid_proc_control_D[2], @@ -780,7 +780,7 @@ dissect_usb_video_processing_unit(proto_tree *tree, tvbuff_t *tvb, int offset) /* UVC 1.1 added bmVideoStandards */ if (tvb_reported_length_remaining(tvb, offset) > 0) { - static const int *standard_bits[] = { + static int * const standard_bits[] = { &hf_usb_vid_proc_standards_D[0], &hf_usb_vid_proc_standards_D[1], &hf_usb_vid_proc_standards_D[2], @@ -1055,11 +1055,11 @@ dissect_usb_video_streaming_input_header(proto_tree *tree, tvbuff_t *tvb, int of guint8 num_formats; guint8 bm_size; - static const int *info_bits[] = { + static int * const info_bits[] = { &hf_usb_vid_streaming_info_D[0], NULL }; - static const int *control_bits[] = { + static int * const control_bits[] = { &hf_usb_vid_streaming_control_D[0], &hf_usb_vid_streaming_control_D[1], &hf_usb_vid_streaming_control_D[2], @@ -1136,7 +1136,7 @@ static int dissect_usb_video_format(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 subtype) { - static const int *interlace_bits[] = { + static int * const interlace_bits[] = { &hf_usb_vid_is_interlaced, &hf_usb_vid_interlaced_fields, &hf_usb_vid_field_1_first, @@ -1170,7 +1170,7 @@ dissect_usb_video_format(proto_tree *tree, tvbuff_t *tvb, int offset, } else if (subtype == VS_FORMAT_MJPEG) { - static const int * flags[] = { + static int * const flags[] = { &hf_usb_vid_mjpeg_fixed_samples, NULL }; @@ -1227,7 +1227,7 @@ static int dissect_usb_video_frame(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 subtype) { - static const int *capability_bits[] = { + static int * const capability_bits[] = { &hf_usb_vid_frame_stills_supported, &hf_usb_vid_frame_fixed_frame_rate, NULL @@ -1510,7 +1510,7 @@ dissect_usb_vid_probe(proto_tree *parent_tree, tvbuff_t *tvb, int offset) { proto_tree *tree; - static const int *hint_bits[] = { + static int * const hint_bits[] = { &hf_usb_vid_probe_hint_D[0], &hf_usb_vid_probe_hint_D[1], &hf_usb_vid_probe_hint_D[2], @@ -1541,7 +1541,7 @@ dissect_usb_vid_probe(proto_tree *parent_tree, tvbuff_t *tvb, int offset) /* UVC 1.1 fields */ if (tvb_reported_length_remaining(tvb, offset) > 0) { - static const int *framing_bits[] = { + static int * const framing_bits[] = { &hf_usb_vid_probe_framing_D[0], &hf_usb_vid_probe_framing_D[1], NULL @@ -1658,7 +1658,7 @@ get_control_selector_name(guint8 entity_id, guint8 control_sel, usb_conv_info_t static int dissect_usb_vid_control_info(proto_tree *tree, tvbuff_t *tvb, int offset) { - static const int *capability_bits[] = { + static int * const capability_bits[] = { &hf_usb_vid_control_info_D[0], &hf_usb_vid_control_info_D[1], &hf_usb_vid_control_info_D[2], diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index a086927dd3..4f7f841b50 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -123,7 +123,7 @@ static int hf_setup_map_local = -1; static int hf_dma_sg_combined = -1; static int hf_aligned_temp_buffer = -1; -static const int *transfer_flags_fields[] = { +static int * const transfer_flags_fields[] = { &hf_short_not_ok, &hf_iso_asap, &hf_no_transfer_dma_map, @@ -377,13 +377,13 @@ static expert_field ei_usbport_invalid_path_depth = EI_INIT; static int usb_address_type = -1; -static const int *usb_endpoint_fields[] = { +static int * const usb_endpoint_fields[] = { &hf_usb_endpoint_direction, &hf_usb_endpoint_number, NULL }; -static const int *usb_usbpcap_info_fields[] = { +static int * const usb_usbpcap_info_fields[] = { &hf_usb_usbpcap_info_reserved, &hf_usb_usbpcap_info_direction, NULL @@ -696,7 +696,7 @@ static const value_string usb_freebsd_transfer_type_vals[] = { #define FREEBSD_FLAG_NO_PIPE_OK 0x00000080 #define FREEBSD_FLAG_STALL_PIPE 0x00000100 -static const int *usb_xferflags_fields[] = { +static int * const usb_xferflags_fields[] = { &hf_usb_xferflags_force_short_xfer, &hf_usb_xferflags_short_xfer_ok, &hf_usb_xferflags_short_frames_ok, @@ -731,7 +731,7 @@ static const int *usb_xferflags_fields[] = { #define FREEBSD_STATUS_CAN_CANCEL_IMMED 0x00040000 #define FREEBSD_STATUS_DOING_CALLBACK 0x00080000 -static const int *usb_xferstatus_fields[] = { +static int * const usb_xferstatus_fields[] = { &hf_usb_xferstatus_open, &hf_usb_xferstatus_transferring, &hf_usb_xferstatus_did_dma_delay, @@ -839,7 +839,7 @@ static const value_string usb_freebsd_speed_vals[] = { #define FREEBSD_FRAMEFLAG_READ 0x00000001 #define FREEBSD_FRAMEFLAG_DATA_FOLLOWS 0x00000002 -static const int *usb_frame_flags_fields[] = { +static int * const usb_frame_flags_fields[] = { &hf_usb_frame_flags_read, &hf_usb_frame_flags_data_follows, NULL @@ -3719,7 +3719,7 @@ dissect_usb_bmrequesttype(proto_tree *parent_tree, tvbuff_t *tvb, int offset, gu { guint64 val; - static const int *bmRequestType_bits[] = { + static int * const bmRequestType_bits[] = { &hf_usb_bmRequestType_direction, &hf_usb_bmRequestType_type, &hf_usb_bmRequestType_recipient, @@ -4929,7 +4929,7 @@ dissect_netmon_usb_port(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, v proto_tree *usb_port_tree; int offset = 0; struct netmon_provider_id_data *provider_id_data = (struct netmon_provider_id_data*)data; - static const int *keyword_fields[] = { + static int * const keyword_fields[] = { &hf_usbport_keyword_diagnostic, &hf_usbport_keyword_power_diagnostics, &hf_usbport_keyword_perf_diagnostics, diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c index bf439c502f..c0dd8c1e36 100644 --- a/epan/dissectors/packet-usbll.c +++ b/epan/dissectors/packet-usbll.c @@ -310,7 +310,7 @@ dissect_usbll_token(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint of guint8 endpoint; guint16 address_bits; - static const int *address_fields[] = { + static int * const address_fields[] = { &hf_usbll_device_addr, &hf_usbll_endp, NULL diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 65bce3406d..095f96364b 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -240,7 +240,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ guint vlan_nested_count; int hf1, hf2; - int * flags[] = { + int * const flags[] = { &hf1, &hf2, &hfi_vlan_id.id, @@ -312,7 +312,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } } - proto_tree_add_bitmask_list(vlan_tree, tvb, 0, 2, (const int **)flags, ENC_BIG_ENDIAN); + proto_tree_add_bitmask_list(vlan_tree, tvb, 0, 2, flags, ENC_BIG_ENDIAN); if (gbl_resolv_flags.vlan_name) { item = proto_tree_add_string(vlan_tree, &hfi_vlan_id_name, tvb, 0, 2, diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 4b1c0a35ae..d7cadd5644 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -829,7 +829,7 @@ static int hf_vnc_fence_block_before = -1; static int hf_vnc_fence_payload_length = -1; static int hf_vnc_fence_payload = -1; -static const int *vnc_fence_flags[] = { +static int * const vnc_fence_flags[] = { &hf_vnc_fence_request, &hf_vnc_fence_sync_next, &hf_vnc_fence_block_after, diff --git a/epan/dissectors/packet-vntag.c b/epan/dissectors/packet-vntag.c index e2d827f411..f56569503f 100644 --- a/epan/dissectors/packet-vntag.c +++ b/epan/dissectors/packet-vntag.c @@ -57,7 +57,7 @@ dissect_vntag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U https://d2zmdbbm9feqrf.cloudfront.net/2012/usa/pdf/BRKDCT-2340.pdf p.61 http://www.definethecloud.net/access-layer-network-virtualization-vn-tag-and-vepa */ - static const int * fields[] = { + static int * const fields[] = { &hf_vntag_dir, &hf_vntag_ptr, &hf_vntag_dst, diff --git a/epan/dissectors/packet-vsip.c b/epan/dissectors/packet-vsip.c index 25c45cd2ff..ab387b1230 100644 --- a/epan/dissectors/packet-vsip.c +++ b/epan/dissectors/packet-vsip.c @@ -897,7 +897,7 @@ static guint32 vsip_PingResp(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t int soffset = offset; guint16 len; proto_item *ti; - const int *supp_conn_types[] = { + static int * const supp_conn_types[] = { &hf_vsip_PingResp_SuppConnTypes_VOLATILE, &hf_vsip_PingResp_SuppConnTypes_RTP, &hf_vsip_PingResp_SuppConnTypes_SSL, diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c index 6a61c8eb53..d93ece4de3 100644 --- a/epan/dissectors/packet-vxlan.c +++ b/epan/dissectors/packet-vxlan.c @@ -48,7 +48,7 @@ static int hf_vxlan_next_proto = -1; static int ett_vxlan = -1; static int ett_vxlan_flags = -1; -static const int *flags_fields[] = { +static int * const flags_fields[] = { &hf_vxlan_flag_g, &hf_vxlan_flag_d, &hf_vxlan_flag_i, @@ -57,7 +57,7 @@ static const int *flags_fields[] = { NULL }; -static const int *gpe_flags_fields[] = { +static int * const gpe_flags_fields[] = { &hf_vxlan_gpe_flag_ver, &hf_vxlan_gpe_flag_i, &hf_vxlan_gpe_flag_p, diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 5751f0d1a7..8ac690ad8a 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -856,7 +856,7 @@ dissect_wccp2_service_info(tvbuff_t *tvb, int offset, gint length, int i; int max_offset = offset+length; - static const int *flag_fields[] = { + static int * const flag_fields[] = { &hf_service_info_flags_src_ip_hash, &hf_service_info_flags_dest_ip_hash, &hf_service_info_flags_src_port_hash, @@ -1009,7 +1009,7 @@ dissect_wccp2_web_cache_identity_element(tvbuff_t *tvb, int offset, gint length, guint16 flags; guint data_element_type; - static const int *flag_fields[] = { + static int * const flag_fields[] = { &hf_web_cache_identity_flag_hash_info, &hf_web_cache_identity_flag_assign_type, &hf_web_cache_identity_flag_version_request, diff --git a/epan/dissectors/packet-wifi-nan.c b/epan/dissectors/packet-wifi-nan.c index 0c16b7e567..940f273aa4 100644 --- a/epan/dissectors/packet-wifi-nan.c +++ b/epan/dissectors/packet-wifi-nan.c @@ -424,14 +424,14 @@ static const value_string attribute_types[] = { }; // Bitmask fields shared by multiple attributes -static const int* map_control_fields[] = { +static int* const map_control_fields[] = { &hf_nan_map_ctrl_map_id, &hf_nan_map_ctrl_availability_interval_duration, &hf_nan_map_ctrl_repeat, NULL }; -static const int* time_bitmap_ctr_fields[] = { +static int* const time_bitmap_ctr_fields[] = { &hf_nan_time_bitmap_ctrl_bit_duration, &hf_nan_time_bitmap_ctrl_period, &hf_nan_time_bitmap_ctrl_start_offset, @@ -891,7 +891,7 @@ dissect_attr_sda(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 attr offset + 10, 1, ENC_BIG_ENDIAN); offset += 11; - static const int* service_ctr_fields[] = { + static int* const service_ctr_fields[] = { &hf_nan_attr_sda_sc_type, &hf_nan_attr_sda_sc_matching_filter, &hf_nan_attr_sda_sc_service_response, @@ -957,7 +957,7 @@ dissect_attr_sda(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 attr offset, 1, ENC_LITTLE_ENDIAN); gint srf_len = tvb_get_guint8(tvb, offset); - static const int* srf_ctr_fields[] = { + static int* const srf_ctr_fields[] = { &hf_nan_attr_sda_srf_ctr_type, &hf_nan_attr_sda_srf_ctr_include, &hf_nan_attr_sda_srf_ctr_bloom_filter_index, @@ -998,7 +998,7 @@ dissect_attr_sdea(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 att offset += 4; guint16 dissected_len = 1; - static const int* sdea_ctr_fields[] = { + static int* const sdea_ctr_fields[] = { &hf_nan_attr_sdea_ctr_fsd, &hf_nan_attr_sdea_ctr_fsd_w_gas, &hf_nan_attr_sdea_ctr_data_path, @@ -1064,7 +1064,7 @@ dissect_attr_connection_capability(proto_tree* attr_tree, tvbuff_t* tvb, gint of return; } - static const int* connection_cap_bitmap_fields[] = { + static int* const connection_cap_bitmap_fields[] = { &hf_nan_attr_connection_cap_wifi_direct, &hf_nan_attr_connection_cap_p2ps, &hf_nan_attr_connection_cap_tdls, @@ -1111,7 +1111,7 @@ dissect_attr_p2p_operation(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, gu } guint sub_offset = offset + 3; - static const int* p2p_bitmap_fields[] = { + static int* const p2p_bitmap_fields[] = { &hf_nan_attr_p2p_device_role_device, &hf_nan_attr_p2p_device_role_group_owner, &hf_nan_attr_p2p_device_role_client, @@ -1204,7 +1204,7 @@ dissect_attr_further_availability_map(proto_tree* attr_tree, tvbuff_t* tvb, gint proto_tree_add_item(attr_tree, hf_nan_attr_further_av_map_id, tvb, sub_offset, 1, ENC_BIG_ENDIAN); sub_offset++; - static const int* availability_entry_control_fields[] = { + static int* const availability_entry_control_fields[] = { &hf_nan_attr_further_av_map_entry_av_interval_duration, NULL }; @@ -1272,19 +1272,19 @@ dissect_attr_device_capability(proto_tree* attr_tree, tvbuff_t* tvb, gint offset return; } - static const int* device_cap_map_id_fields[] = { + static int* const device_cap_map_id_fields[] = { &hf_nan_attr_device_cap_map_id_apply_to, &hf_nan_attr_device_cap_map_id_associated_maps, NULL }; - static const int* device_cap_committed_dw_fields[] = { + static int* const device_cap_committed_dw_fields[] = { &hf_nan_attr_device_cap_committed_dw_24ghz, &hf_nan_attr_device_cap_committed_dw_5ghz, &hf_nan_attr_device_cap_committed_dw_24ghz_overwrite, &hf_nan_attr_device_cap_committed_dw_5ghz_overwrite, NULL }; - static const int* device_cap_supported_bands_fields[] = { + static int* const device_cap_supported_bands_fields[] = { &hf_nan_attr_device_cap_supported_bands_reserved_tv_whitespaces, &hf_nan_attr_device_cap_supported_bands_sub_1ghz, &hf_nan_attr_device_cap_supported_bands_24ghz, @@ -1293,19 +1293,19 @@ dissect_attr_device_capability(proto_tree* attr_tree, tvbuff_t* tvb, gint offset &hf_nan_attr_device_cap_supported_bands_reserved_60ghz, NULL }; - static const int* device_cap_op_mode_fields[] = { + static int* const device_cap_op_mode_fields[] = { &hf_nan_attr_device_cap_op_mode_phy, &hf_nan_attr_device_cap_op_mode_vht8080, &hf_nan_attr_device_cap_op_mode_vht160, &hf_nan_attr_device_cap_op_mode_reserved_paging_ndl, NULL }; - static const int* device_cap_antennas_fields[] = { + static int* const device_cap_antennas_fields[] = { &hf_nan_attr_device_cap_antennas_tx, &hf_nan_attr_device_cap_antennas_rx, NULL }; - static const int* device_cap_capabilities_fields[] = { + static int* const device_cap_capabilities_fields[] = { &hf_nan_attr_device_cap_capabilities_dfs_master, &hf_nan_attr_device_cap_capabilities_extended_key_id, &hf_nan_attr_device_cap_capabilities_simul_ndp_reception, @@ -1342,12 +1342,12 @@ dissect_attr_ndp(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 attr proto_tree_add_item(attr_tree, hf_nan_dialog_tokens, tvb, sub_offset, 1, ENC_BIG_ENDIAN); sub_offset++; - static const int* ndp_type_status_fields[] = { + static int* const ndp_type_status_fields[] = { &hf_nan_attr_ndp_type, &hf_nan_status_1, NULL }; - static const int* ndp_control_fields[] = { + static int* const ndp_control_fields[] = { &hf_nan_attr_ndp_ctrl_confirm, &hf_nan_attr_ndp_ctrl_security_pres, &hf_nan_attr_ndp_ctrl_publish_id_pres, @@ -1401,12 +1401,12 @@ dissect_attr_ndpe(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 att return; } - static const int* ndp_type_status_fields[] = { + static int* const ndp_type_status_fields[] = { &hf_nan_attr_ndp_type, &hf_nan_status_1, NULL }; - static const int* ndp_control_fields[] = { + static int* const ndp_control_fields[] = { &hf_nan_attr_ndp_ctrl_confirm, &hf_nan_attr_ndp_ctrl_security_pres, &hf_nan_attr_ndp_ctrl_publish_id_pres, @@ -1490,7 +1490,7 @@ dissect_attr_availability(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, gui return; } - static const int* availability_ctr_fields[] = { + static int* const availability_ctr_fields[] = { &hf_nan_attr_availability_map_id, &hf_nan_attr_availability_committed_changed, &hf_nan_attr_availability_potential_changed, @@ -1500,7 +1500,7 @@ dissect_attr_availability(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, gui &hf_nan_attr_availability_reserved_multicast_schedule_change_changed, NULL }; - static const int* availability_entry_ctr_fields[] = { + static int* const availability_entry_ctr_fields[] = { &hf_nan_attr_availability_entry_ctr_type, &hf_nan_attr_availability_entry_ctr_pref, &hf_nan_attr_availability_entry_ctr_utilization, @@ -1643,12 +1643,12 @@ dissect_attr_ndc(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 attr return; } - static const int* ndc_ctr_fields[] = { + static int* const ndc_ctr_fields[] = { &hf_nan_attr_ndc_ctrl_selected, NULL }; - static const int* ndc_map_id_fields[] = { + static int* const ndc_map_id_fields[] = { &hf_nan_attr_ndc_map_id_related_sch, NULL }; @@ -1693,12 +1693,12 @@ dissect_attr_ndl(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, guint16 attr proto_tree_add_item(attr_tree, hf_nan_dialog_tokens, tvb, sub_offset, 1, ENC_BIG_ENDIAN); sub_offset++; - static const int* ndl_type_status_fields[] = { + static int* const ndl_type_status_fields[] = { &hf_nan_attr_ndl_type, &hf_nan_status_1, NULL }; - static const int* ndl_control_fields[] = { + static int* const ndl_control_fields[] = { &hf_nan_attr_ndl_ctrl_peer_id, &hf_nan_attr_ndl_ctrl_immutable_schedule_pres, &hf_nan_attr_ndl_ctrl_ndc_pres, @@ -1783,7 +1783,7 @@ dissect_attr_unaligned_schedule(proto_tree* attr_tree, tvbuff_t* tvb, gint offse guint sub_offset = offset + 3; guint dissected_len = 0; - static const int* control_fields[] = { + static int* const control_fields[] = { &hf_nan_attr_unaligned_sch_ctrl_schedule_id, &hf_nan_attr_unaligned_sch_ctrl_seq_id, NULL @@ -1801,7 +1801,7 @@ dissect_attr_unaligned_schedule(proto_tree* attr_tree, tvbuff_t* tvb, gint offse proto_tree_add_item(attr_tree, hf_nan_attr_unaligned_sch_count_down, tvb, sub_offset, 1, ENC_BIG_ENDIAN); sub_offset++; - static const int* ulw_overwrite_fields[] = { + static int* const ulw_overwrite_fields[] = { &hf_nan_attr_unaligned_sch_ulw_overwrite_all, &hf_nan_attr_unaligned_sch_ulw_overwrite_map_id, NULL @@ -1815,7 +1815,7 @@ dissect_attr_unaligned_schedule(proto_tree* attr_tree, tvbuff_t* tvb, gint offse // ULW Control and Band ID or Channel Entry present if (dissected_len < attr_len) { - static const int* ulw_control_fields[] = { + static int* const ulw_control_fields[] = { &hf_nan_attr_unaligned_sch_ulw_ctrl_type, &hf_nan_attr_unaligned_sch_ulw_ctrl_channel_av, &hf_nan_attr_unaligned_sch_ulw_ctrl_rxnss, @@ -1873,7 +1873,7 @@ static void dissect_attr_ranging_info(proto_tree* attr_tree, tvbuff_t* tvb, gint offset) { guint sub_offset = offset + 3; - static const int* location_info_availability_fields[] = { + static int* const location_info_availability_fields[] = { &hf_nan_attr_ranging_info_location_info_avail_lci, &hf_nan_attr_ranging_info_location_info_avail_geospatial, &hf_nan_attr_ranging_info_location_info_avail_civic_location, @@ -1905,12 +1905,12 @@ dissect_attr_ranging_setup(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, gu proto_tree_add_item(attr_tree, hf_nan_dialog_tokens, tvb, sub_offset, 1, ENC_BIG_ENDIAN); sub_offset++; - static const int* ranging_setup_type_status_fields[] = { + static int* const ranging_setup_type_status_fields[] = { &hf_nan_attr_ranging_setup_type, &hf_nan_status_2, NULL }; - static const int* ranging_setup_ctrl_fields[] = { + static int* const ranging_setup_ctrl_fields[] = { &hf_nan_attr_ranging_setup_ctrl_report_req, &hf_nan_attr_ranging_setup_ctrl_ftm_params, &hf_nan_attr_ranging_setup_ctrl_entry_list, @@ -1931,7 +1931,7 @@ dissect_attr_ranging_setup(proto_tree* attr_tree, tvbuff_t* tvb, gint offset, gu if (ftm_check) { - static const int* ranging_setup_ftm_param_fields[] = { + static int* const ranging_setup_ftm_param_fields[] = { &hf_nan_attr_ranging_setup_ftm_max_burst_duration, &hf_nan_attr_ranging_setup_ftm_min_delta, &hf_nan_attr_ranging_setup_ftm_max_per_burst, @@ -1980,7 +1980,7 @@ dissect_attr_element_container(proto_tree* attr_tree, tvbuff_t* tvb, gint offset guint sub_offset = offset + 3; // Some header fields and trees are reused. - static const int* container_map_id_fields[] = { + static int* const container_map_id_fields[] = { &hf_nan_attr_device_cap_map_id_apply_to, &hf_nan_attr_device_cap_map_id_associated_maps, NULL @@ -2057,7 +2057,7 @@ dissect_attr_extended_p2p_operation(proto_tree* attr_tree, tvbuff_t* tvb, gint o } guint sub_offset = offset + 3; - static const int* ext_p2p_bitmap_fields[] = { + static int* const ext_p2p_bitmap_fields[] = { &hf_nan_attr_p2p_device_role_device, &hf_nan_attr_p2p_device_role_group_owner, &hf_nan_attr_p2p_device_role_client, diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index ca7c136681..6d7658ebae 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1712,7 +1712,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *subtree, *generic_tree, *standard_tree, *specific_tree; guint32 access; - static const int * generic_access_flags[] = { + static int * const generic_access_flags[] = { &hf_access_generic_read, &hf_access_generic_write, &hf_access_generic_execute, @@ -1722,7 +1722,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, NULL }; - static const int * standard_access_flags[] = { + static int * const standard_access_flags[] = { &hf_access_standard_synchronise, &hf_access_standard_write_owner, &hf_access_standard_write_dac, @@ -1731,7 +1731,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, NULL }; - static const int * access_specific_flags[] = { + static int * const access_specific_flags[] = { &hf_access_specific_15, &hf_access_specific_14, &hf_access_specific_13, @@ -1951,7 +1951,7 @@ dissect_nt_ace_object(tvbuff_t *tvb, int offset, proto_tree *parent_tree) guint32 flags; int old_offset=offset; const char *sep = " "; - static const int * ace_flags[] = { + static int * const ace_flags[] = { &hf_nt_ace_flags_object_type_present, &hf_nt_ace_flags_inherited_object_type_present, NULL @@ -1993,7 +1993,7 @@ dissect_nt_v2_ace_flags(tvbuff_t *tvb, int offset, proto_tree *parent_tree, proto_item *item = NULL; guint8 mask; const char *sep = " "; - static const int * ace_flags[] = { + static int * const ace_flags[] = { &hf_nt_ace_flags_failed_access, &hf_nt_ace_flags_successful_access, &hf_nt_ace_flags_inherited_ace, @@ -2286,7 +2286,7 @@ static const true_false_string tfs_sec_desc_type_self_relative = { static int dissect_nt_sec_desc_type(tvbuff_t *tvb, int offset, proto_tree *parent_tree) { - static const int * flags[] = { + static int * const flags[] = { &hf_nt_sec_desc_type_self_relative, &hf_nt_sec_desc_type_rm_control_valid, &hf_nt_sec_desc_type_sacl_protected, @@ -2318,7 +2318,7 @@ dissect_nt_security_information(tvbuff_t *tvb, int offset, proto_tree *parent_tr { proto_item *item = NULL; guint32 mask; - static const int * flags[] = { + static int * const flags[] = { &hf_nt_security_information_sacl, &hf_nt_security_information_dacl, &hf_nt_security_information_group, diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index dd215f6544..47714364fd 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -370,7 +370,7 @@ dissect_winsrepl_wins_name(tvbuff_t *winsrepl_tvb, packet_info *pinfo, char name_str[(NETBIOS_NAME_LEN - 1)*4 + 1]; int name_type; guint32 flags; - static const int * name_flags[] = { + static int * const name_flags[] = { &hf_winsrepl_name_flags_rectype, &hf_winsrepl_name_flags_recstate, &hf_winsrepl_name_flags_local, diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c index 1c85439ad4..74f4c63d9b 100644 --- a/epan/dissectors/packet-wisun.c +++ b/epan/dissectors/packet-wisun.c @@ -362,14 +362,14 @@ static const true_false_string wisun_netricity_sc_contention_control_tfs = { "Contention allowed in next contention state" }; -static const int * wisun_format_nested_ie[] = { +static int * const wisun_format_nested_ie[] = { &hf_wisun_wsie_type, &hf_wisun_wsie_id, &hf_wisun_wsie_length, NULL }; -static const int * wisun_format_nested_ie_short[] = { +static int * const wisun_format_nested_ie_short[] = { &hf_wisun_wsie_type, &hf_wisun_wsie_id_short, &hf_wisun_wsie_length_short, @@ -625,14 +625,14 @@ dissect_wisun_hie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat static int dissect_wisun_schedule_common(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tree) { - static const int * fields_usie_channel[] = { + static int * const fields_usie_channel[] = { &hf_wisun_usie_channel_plan, &hf_wisun_usie_channel_function, &hf_wisun_usie_channel_exclude, NULL }; - static const int * fields_usie_channel_plan_explicit[] = { + static int * const fields_usie_channel_plan_explicit[] = { &hf_wisun_usie_explicit_frequency, &hf_wisun_usie_explicit_spacing, &hf_wisun_usie_explicit_reserved, @@ -785,7 +785,7 @@ dissect_wisun_panie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, voi proto_tree *subtree; guint offset = 0; guint32 routingCost; - static const int * fields_panie_flags[] = { + static int * const fields_panie_flags[] = { &hf_wisun_panie_flag_parent_bsie, &hf_wisun_panie_flag_routing_method, &hf_wisun_panie_flag_version, @@ -1007,7 +1007,7 @@ static int dissect_wisun_eapol_relay(tvbuff_t *tvb, packet_info *pinfo, proto_tr static int dissect_wisun_netricity_sc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - static const int * fields_sc[] = { + static int * const fields_sc[] = { &hf_wisun_netricity_sc_reserved, &hf_wisun_netricity_sc_tone_map_request, &hf_wisun_netricity_sc_contention_control, diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 2231904044..3422bf2a77 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -801,7 +801,7 @@ add_wps_wfa_ext(guint8 id, proto_tree *tree, tvbuff_t *tvb, proto_item *item; proto_tree *elem; guint8 val8; - static const int *flags[] = { + static int * const flags[] = { &hf_multi_ap_backhaul_sta, &hf_multi_ap_backhaul_bss, &hf_multi_ap_fronthaul_bss, diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index 36e303f611..60b7a25901 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -220,7 +220,7 @@ dissect_wsmp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 oct) guint16 count, ie_len, wsm_len; guint32 tpid, psid = 0; - static const int * flags[] = { + static int * const flags[] = { &hf_wsmp_subtype, &hf_wsmp_N_header_opt_ind, &hf_wsmp_version_v3, diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 0f53b86739..8b95479152 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -3844,7 +3844,7 @@ parameter_value_q (proto_tree *tree, packet_info *pinfo, proto_item *ti, tvbuff_ return offset; } -static const int * address_length_flags[] = { +static int * const address_length_flags[] = { &hf_address_flags_length_bearer_type_included, &hf_address_flags_length_port_number_included, &hf_address_flags_length_address_len, @@ -3878,7 +3878,7 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, conversation_t *conv; guint32 idx = 0; /* Address index */ guint32 address_record_len; /* Length of the entire address record */ - static const int * flags[] = { + static int * const flags[] = { &hf_wsp_redirect_permanent, &hf_wsp_redirect_reuse_security_session, NULL @@ -5261,7 +5261,7 @@ add_capabilities (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, guint8 pd * given by capaValueLen - len. */ if (capaValueLen - len == 1) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_capa_protocol_option_confirmed_push, &hf_capa_protocol_option_push, &hf_capa_protocol_option_session_resume, diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index dd205a1e46..fc805db12a 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -2375,7 +2375,7 @@ static guint32 field32(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, return v; } -static const int * gc_mask_attributes[] = { +static int * const gc_mask_attributes[] = { &hf_x11_gc_value_mask_function, &hf_x11_gc_value_mask_plane_mask, &hf_x11_gc_value_mask_foreground, @@ -2560,7 +2560,7 @@ static guint32 requestLength(tvbuff_t *tvb, int *offsetp, proto_tree *t, static void setOfEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order) { - static const int * events[] = { + static int * const events[] = { &hf_x11_event_mask_KeyPress, &hf_x11_event_mask_KeyRelease, &hf_x11_event_mask_ButtonPress, @@ -2596,7 +2596,7 @@ static void setOfEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t, static void setOfDeviceEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order) { - static const int * do_not_propagate_events[] = { + static int * const do_not_propagate_events[] = { &hf_x11_do_not_propagate_mask_KeyPress, &hf_x11_do_not_propagate_mask_KeyRelease, &hf_x11_do_not_propagate_mask_ButtonPress, @@ -2664,7 +2664,7 @@ static void setOfKeyButMask(tvbuff_t *tvb, int *offsetp, proto_tree *t, static void setOfPointerEvent(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order) { - static const int * pointer_events[] = { + static int * const pointer_events[] = { &hf_x11_pointer_event_mask_ButtonRelease, &hf_x11_pointer_event_mask_EnterWindow, &hf_x11_pointer_event_mask_LeaveWindow, @@ -2725,7 +2725,7 @@ static void windowAttributes(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order) { guint32 bitmask; - static const int * window_attributes_flags[] = { + static int * const window_attributes_flags[] = { &hf_x11_window_value_mask_background_pixmap, &hf_x11_window_value_mask_background_pixel, &hf_x11_window_value_mask_border_pixmap, @@ -3689,7 +3689,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, case X_ConfigureWindow: { guint16 bitmask16; - static const int * window_attributes_flags[] = { + static int * const window_attributes_flags[] = { &hf_x11_window_value_mask_background_pixmap, &hf_x11_window_value_mask_background_pixel, &hf_x11_window_value_mask_border_pixmap, @@ -4623,7 +4623,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, case X_ChangeKeyboardControl: { guint32 bitmask32; - static const int * keyboard_value_flags[] = { + static int * const keyboard_value_flags[] = { &hf_x11_keyboard_value_mask_key_click_percent, &hf_x11_keyboard_value_mask_bell_percent, &hf_x11_keyboard_value_mask_bell_pitch, diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 7892b1e516..41f54b5889 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -5364,7 +5364,7 @@ dissect_x2ap_T_transmissionModes(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_MDT_transmissionModes_tm1, &hf_x2ap_MDT_transmissionModes_tm2, &hf_x2ap_MDT_transmissionModes_tm3, @@ -5658,7 +5658,7 @@ dissect_x2ap_EncryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_encryptionAlgorithms_EEA1, &hf_x2ap_encryptionAlgorithms_EEA2, &hf_x2ap_encryptionAlgorithms_EEA3, @@ -6991,7 +6991,7 @@ dissect_x2ap_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, as 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_integrityProtectionAlgorithms_EIA1, &hf_x2ap_integrityProtectionAlgorithms_EIA2, &hf_x2ap_integrityProtectionAlgorithms_EIA3, @@ -7027,7 +7027,7 @@ dissect_x2ap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_interfacesToTrace_S1_MME, &hf_x2ap_interfacesToTrace_X2, &hf_x2ap_interfacesToTrace_Uu, @@ -7689,7 +7689,7 @@ dissect_x2ap_MeasurementsToActivate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_measurementsToActivate_M1, &hf_x2ap_measurementsToActivate_M2, &hf_x2ap_measurementsToActivate_M3, @@ -7753,7 +7753,7 @@ dissect_x2ap_MDT_Location_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac 8, 8, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_MDT_Location_Info_GNSS, &hf_x2ap_MDT_Location_Info_E_CID, &hf_x2ap_MDT_Location_Info_Reserved, @@ -8361,7 +8361,7 @@ dissect_x2ap_NRencryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_NRencryptionAlgorithms_NEA1, &hf_x2ap_NRencryptionAlgorithms_NEA2, &hf_x2ap_NRencryptionAlgorithms_NEA3, @@ -8387,7 +8387,7 @@ dissect_x2ap_NRintegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, 16, 16, TRUE, NULL, 0, ¶meter_tvb, NULL); if (parameter_tvb) { - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_NRintegrityProtectionAlgorithms_NIA1, &hf_x2ap_NRintegrityProtectionAlgorithms_NIA2, &hf_x2ap_NRintegrityProtectionAlgorithms_NIA3, @@ -9036,7 +9036,7 @@ dissect_x2ap_ReportCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t 32, 32, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_ReportCharacteristics_PRBPeriodic, &hf_x2ap_ReportCharacteristics_TNLLoadIndPeriodic, &hf_x2ap_ReportCharacteristics_HWLoadIndPeriodic, @@ -11128,7 +11128,7 @@ dissect_x2ap_T_measurementFailedReportCharacteristics(tvbuff_t *tvb _U_, int off 32, 32, FALSE, NULL, 0, ¶meter_tvb, NULL); if(parameter_tvb){ - const gint *fields[] = { + static int * const fields[] = { &hf_x2ap_measurementFailedReportCharacteristics_PRBPeriodic, &hf_x2ap_measurementFailedReportCharacteristics_TNLLoadIndPeriodic, &hf_x2ap_measurementFailedReportCharacteristics_HWLoadIndPeriodic, diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index d2f668c968..daf01da64b 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -511,7 +511,7 @@ dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * KeyUsage_bits[] = { +static int * const KeyUsage_bits[] = { &hf_x509ce_KeyUsage_digitalSignature, &hf_x509ce_KeyUsage_contentCommitment, &hf_x509ce_KeyUsage_keyEncipherment, @@ -885,7 +885,7 @@ dissect_x509ce_DistributionPointName(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const int * OnlyCertificateTypes_bits[] = { +static int * const OnlyCertificateTypes_bits[] = { &hf_x509ce_OnlyCertificateTypes_user, &hf_x509ce_OnlyCertificateTypes_authority, &hf_x509ce_OnlyCertificateTypes_attribute, @@ -902,7 +902,7 @@ dissect_x509ce_OnlyCertificateTypes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } -static const int * ReasonFlags_bits[] = { +static int * const ReasonFlags_bits[] = { &hf_x509ce_ReasonFlags_unused, &hf_x509ce_ReasonFlags_keyCompromise, &hf_x509ce_ReasonFlags_cACompromise, @@ -1589,7 +1589,7 @@ dissect_x509ce_GeneralString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o } -static const int * EntrustInfoFlags_bits[] = { +static int * const EntrustInfoFlags_bits[] = { &hf_x509ce_EntrustInfoFlags_keyUpdateAllowed, &hf_x509ce_EntrustInfoFlags_newExtensions, &hf_x509ce_EntrustInfoFlags_pKIXCertificate, diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 6604b54aef..45814f26d7 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -1900,7 +1900,7 @@ dissect_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType(gboolean implicit_tag _U_, t } -static const int * AllowedSubset_bits[] = { +static int * const AllowedSubset_bits[] = { &hf_x509if_AllowedSubset_baseObject, &hf_x509if_AllowedSubset_oneLevel, &hf_x509if_AllowedSubset_wholeSubtree, diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 5a1dbdf30f..704fccee9b 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -961,7 +961,7 @@ dissect_x509sat_T_intDay(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } -static const int * T_bitDay_bits[] = { +static int * const T_bitDay_bits[] = { &hf_x509sat_T_bitDay_sunday, &hf_x509sat_T_bitDay_monday, &hf_x509sat_T_bitDay_tuesday, @@ -1003,7 +1003,7 @@ dissect_x509sat_T_intNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * T_bitNamedDays_bits[] = { +static int * const T_bitNamedDays_bits[] = { &hf_x509sat_T_bitNamedDays_sunday, &hf_x509sat_T_bitNamedDays_monday, &hf_x509sat_T_bitNamedDays_tuesday, @@ -1120,7 +1120,7 @@ dissect_x509sat_T_intWeek(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const int * T_bitWeek_bits[] = { +static int * const T_bitWeek_bits[] = { &hf_x509sat_T_bitWeek_week1, &hf_x509sat_T_bitWeek_week2, &hf_x509sat_T_bitWeek_week3, @@ -1176,7 +1176,7 @@ dissect_x509sat_T_intMonth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off } -static const int * T_bitMonth_bits[] = { +static int * const T_bitMonth_bits[] = { &hf_x509sat_T_bitMonth_january, &hf_x509sat_T_bitMonth_february, &hf_x509sat_T_bitMonth_march, diff --git a/epan/dissectors/packet-xip-serval.c b/epan/dissectors/packet-xip-serval.c index bddc4d9c81..78f012b14f 100644 --- a/epan/dissectors/packet-xip-serval.c +++ b/epan/dissectors/packet-xip-serval.c @@ -65,7 +65,7 @@ static const value_string xip_serval_proto_vals[] = { { 0, NULL }, }; -static const gint *xip_serval_cext_flags[] = { +static int * const xip_serval_cext_flags[] = { &hf_xip_serval_cext_syn, &hf_xip_serval_cext_rsyn, &hf_xip_serval_cext_ack, diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index f8f7473623..d0674740d1 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -135,7 +135,7 @@ void proto_reg_handoff_xmcp(void); #define XMCP_TYPE_CLASS 0x0110 #define XMCP_TYPE_METHOD 0x3eef -static const int *xmcp_type_fields[] = { +static int * const xmcp_type_fields[] = { &hf_xmcp_type_reserved, &hf_xmcp_type_method, &hf_xmcp_type_class, diff --git a/epan/dissectors/packet-xnap.c b/epan/dissectors/packet-xnap.c index 81ef8a30b2..d4cae636cf 100644 --- a/epan/dissectors/packet-xnap.c +++ b/epan/dissectors/packet-xnap.c @@ -5258,7 +5258,7 @@ dissect_xnap_SEQUENCE_SIZE_1_maxnoofEPLMNs_OF_PLMN_Identity(tvbuff_t *tvb _U_, i } -static const int * RAT_RestrictionInformation_bits[] = { +static int * const RAT_RestrictionInformation_bits[] = { &hf_xnap_RAT_RestrictionInformation_e_UTRA, &hf_xnap_RAT_RestrictionInformation_nR, NULL @@ -9294,7 +9294,7 @@ dissect_xnap_T_ng_ran_TraceID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const int * T_interfaces_to_trace_bits[] = { +static int * const T_interfaces_to_trace_bits[] = { &hf_xnap_T_interfaces_to_trace_ng_c, &hf_xnap_T_interfaces_to_trace_x_nc, &hf_xnap_T_interfaces_to_trace_uu, @@ -9438,7 +9438,7 @@ dissect_xnap_UEContextID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } -static const int * T_nr_EncyptionAlgorithms_bits[] = { +static int * const T_nr_EncyptionAlgorithms_bits[] = { &hf_xnap_T_nr_EncyptionAlgorithms_spare_bit0, &hf_xnap_T_nr_EncyptionAlgorithms_nea1_128, &hf_xnap_T_nr_EncyptionAlgorithms_nea2_128, @@ -9455,7 +9455,7 @@ dissect_xnap_T_nr_EncyptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ct } -static const int * T_nr_IntegrityProtectionAlgorithms_bits[] = { +static int * const T_nr_IntegrityProtectionAlgorithms_bits[] = { &hf_xnap_T_nr_IntegrityProtectionAlgorithms_spare_bit0, &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia1_128, &hf_xnap_T_nr_IntegrityProtectionAlgorithms_nia2_128, @@ -9472,7 +9472,7 @@ dissect_xnap_T_nr_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U } -static const int * T_e_utra_EncyptionAlgorithms_bits[] = { +static int * const T_e_utra_EncyptionAlgorithms_bits[] = { &hf_xnap_T_e_utra_EncyptionAlgorithms_spare_bit0, &hf_xnap_T_e_utra_EncyptionAlgorithms_eea1_128, &hf_xnap_T_e_utra_EncyptionAlgorithms_eea2_128, @@ -9489,7 +9489,7 @@ dissect_xnap_T_e_utra_EncyptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn } -static const int * T_e_utra_IntegrityProtectionAlgorithms_bits[] = { +static int * const T_e_utra_IntegrityProtectionAlgorithms_bits[] = { &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_spare_bit0, &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia1_128, &hf_xnap_T_e_utra_IntegrityProtectionAlgorithms_eia2_128, diff --git a/epan/dissectors/packet-xra.c b/epan/dissectors/packet-xra.c index f59d899c99..6803906f36 100644 --- a/epan/dissectors/packet-xra.c +++ b/epan/dissectors/packet-xra.c @@ -708,7 +708,7 @@ dissect_timestamp_mb(tvbuff_t * tvb, proto_tree* tree) { proto_item* timestamp_it; proto_tree* timestamp_tree; - static const int * timestamp_parts[] = { + static int * const timestamp_parts[] = { &hf_plc_mb_ts_timestamp_epoch, &hf_plc_mb_ts_timestamp_d30timestamp, &hf_plc_mb_ts_timestamp_extra_204_8, diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 2376893a61..27399495b9 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -878,7 +878,7 @@ dissect_xtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) guint cmd_options; vec_t cksum_vec[1]; gboolean have_btag; - static const int * cmd_options_flags[] = { + static int * const cmd_options_flags[] = { &hf_xtp_cmd_options_nocheck, &hf_xtp_cmd_options_edge, &hf_xtp_cmd_options_noerr, diff --git a/epan/dissectors/packet-z3950.c b/epan/dissectors/packet-z3950.c index 2e4d121a60..c6c2ed78ed 100644 --- a/epan/dissectors/packet-z3950.c +++ b/epan/dissectors/packet-z3950.c @@ -2113,7 +2113,7 @@ dissect_z3950_ReferenceId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } -static const int * ProtocolVersion_U_bits[] = { +static int * const ProtocolVersion_U_bits[] = { &hf_z3950_ProtocolVersion_U_version_1, &hf_z3950_ProtocolVersion_U_version_2, &hf_z3950_ProtocolVersion_U_version_3, @@ -2140,7 +2140,7 @@ dissect_z3950_ProtocolVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } -static const int * Options_U_bits[] = { +static int * const Options_U_bits[] = { &hf_z3950_Options_U_search, &hf_z3950_Options_U_present, &hf_z3950_Options_U_delSet, diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index cab9cc0ff8..f6e899bff1 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -776,7 +776,7 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data guint8 fcf; guint8 offset = 0; - static const int * frag_ack_flags[] = { + static int * const frag_ack_flags[] = { &hf_zbee_aps_block_ack1, &hf_zbee_aps_block_ack2, &hf_zbee_aps_block_ack3, diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index c4809e1627..247f30ffed 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -756,7 +756,7 @@ dissect_zbee_nwk_gp_cmd_commissioning(tvbuff_t *tvb, packet_info *pinfo, proto_t GSList *GSList_i; tvbuff_t *payload_tvb; - static const int * options[] = { + static int * const options[] = { &hf_zbee_nwk_gp_cmd_comm_opt_mac_sec_num_cap, &hf_zbee_nwk_gp_cmd_comm_opt_rx_on_cap, &hf_zbee_nwk_gp_cmd_comm_opt_appli_info_present, @@ -766,7 +766,7 @@ dissect_zbee_nwk_gp_cmd_commissioning(tvbuff_t *tvb, packet_info *pinfo, proto_t &hf_zbee_nwk_gp_cmd_comm_opt_ext_opt, NULL }; - static const int * ext_options[] = { + static int * const ext_options[] = { &hf_zbee_nwk_gp_cmd_comm_ext_opt_sec_level_cap, &hf_zbee_nwk_gp_cmd_comm_ext_opt_key_type, &hf_zbee_nwk_gp_cmd_comm_ext_opt_gpd_key_present, @@ -774,14 +774,14 @@ dissect_zbee_nwk_gp_cmd_commissioning(tvbuff_t *tvb, packet_info *pinfo, proto_t &hf_zbee_nwk_gp_cmd_comm_ext_opt_outgoing_counter, NULL }; - static const int * appli_info[] = { + static int * const appli_info[] = { &hf_zbee_nwk_gp_cmd_comm_appli_info_mip, &hf_zbee_nwk_gp_cmd_comm_appli_info_mmip, &hf_zbee_nwk_gp_cmd_comm_appli_info_gclp, &hf_zbee_nwk_gp_cmd_comm_appli_info_crp, NULL }; - static const int * length_of_clid_list[] = { + static int * const length_of_clid_list[] = { &hf_zbee_nwk_gp_cmd_comm_length_of_clid_list_server, &hf_zbee_nwk_gp_cmd_comm_length_of_clid_list_client, NULL @@ -955,7 +955,7 @@ static guint dissect_zbee_nwk_gp_cmd_channel_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, zbee_nwk_green_power_packet *packet _U_, guint offset) { - static const int * channels[] = { + static int * const channels[] = { &hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour_1st, &hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour_2nd, NULL @@ -981,7 +981,7 @@ static guint dissect_zbee_nwk_gp_cmd_channel_configuration(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, zbee_nwk_green_power_packet *packet _U_, guint offset) { - static const int * channels[] = { + static int * const channels[] = { &hf_zbee_nwk_gp_cmd_channel_configuration, NULL }; @@ -1079,7 +1079,7 @@ dissect_zbee_nwk_gp_cmd_commissioning_reply(tvbuff_t *tvb, packet_info *pinfo, p GSList *GSList_i; tvbuff_t *payload_tvb; - static const int * options[] = { + static int * const options[] = { &hf_zbee_nwk_gp_cmd_comm_rep_opt_panid_present, &hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_key_present, &hf_zbee_nwk_gp_cmd_comm_rep_opt_key_encr, @@ -1194,7 +1194,7 @@ dissect_zbee_nwk_gp_cmd_read_attributes(tvbuff_t *tvb, packet_info *pinfo _U_, p guint tvb_len; guint8 i; - static const int * options[] = { + static int * const options[] = { &hf_zbee_nwk_gp_cmd_read_att_opt_multi_rec, &hf_zbee_nwk_gp_cmd_read_att_opt_man_field_present, NULL @@ -1260,7 +1260,7 @@ dissect_zbee_nwk_gp_cmd_write_attributes(tvbuff_t *tvb, packet_info *pinfo _U_, guint end_byte; //guint8 i; - static const int * options[] = { + static int * const options[] = { &hf_zbee_nwk_gp_cmd_read_att_opt_multi_rec, &hf_zbee_nwk_gp_cmd_read_att_opt_man_field_present, NULL @@ -1335,7 +1335,7 @@ dissect_zbee_nwk_gp_cmd_read_attributes_response(tvbuff_t *tvb, packet_info *pin guint tvb_len; guint end_byte; - static const int * options[] = { + static int * const options[] = { &hf_zbee_nwk_gp_cmd_read_att_opt_multi_rec, &hf_zbee_nwk_gp_cmd_read_att_opt_man_field_present, NULL @@ -1730,14 +1730,14 @@ dissect_zbee_nwk_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d proto_item *ti = NULL; tvbuff_t *payload_tvb; zbee_nwk_green_power_packet packet; - static const int * fields[] = { + static int * const fields[] = { &hf_zbee_nwk_gp_frame_type, &hf_zbee_nwk_gp_proto_version, &hf_zbee_nwk_gp_auto_commissioning, &hf_zbee_nwk_gp_fc_ext, NULL }; - static const int * ext_fields[] = { + static int * const ext_fields[] = { &hf_zbee_nwk_gp_fc_ext_app_id, &hf_zbee_nwk_gp_fc_ext_sec_level, &hf_zbee_nwk_gp_fc_ext_sec_key, diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 7a369306f2..5d7a1098ba 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -480,7 +480,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void zbee_nwk_hints_t *nwk_hints; gboolean unicast_src; - static const int * fcf_flags_2007[] = { + static int * const fcf_flags_2007[] = { &hf_zbee_nwk_frame_type, &hf_zbee_nwk_proto_version, &hf_zbee_nwk_discover_route, @@ -493,7 +493,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void NULL }; - static const int * fcf_flags[] = { + static int * const fcf_flags[] = { &hf_zbee_nwk_frame_type, &hf_zbee_nwk_proto_version, &hf_zbee_nwk_discover_route, @@ -696,7 +696,7 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Add multicast control field (ZigBee 2006 and later). */ if ((packet.version >= ZBEE_VERSION_2007) && packet.multicast) { - static const int * multicast_flags[] = { + static int * const multicast_flags[] = { &hf_zbee_nwk_mcast_mode, &hf_zbee_nwk_mcast_radius, &hf_zbee_nwk_mcast_max_radius, @@ -938,14 +938,14 @@ dissect_zbee_nwk_route_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 route_options; guint16 dest_addr; - static const int * nwk_route_command_options_2007[] = { + static int * const nwk_route_command_options_2007[] = { &hf_zbee_nwk_cmd_route_opt_multicast, &hf_zbee_nwk_cmd_route_opt_dest_ext, &hf_zbee_nwk_cmd_route_opt_many_to_one, NULL }; - static const int * nwk_route_command_options[] = { + static int * const nwk_route_command_options[] = { &hf_zbee_nwk_cmd_route_opt_repair, NULL }; @@ -1005,14 +1005,14 @@ dissect_zbee_nwk_route_rep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 orig_addr; guint16 resp_addr; - static const int * nwk_route_command_options_2007[] = { + static int * const nwk_route_command_options_2007[] = { &hf_zbee_nwk_cmd_route_opt_multicast, &hf_zbee_nwk_cmd_route_opt_resp_ext, &hf_zbee_nwk_cmd_route_opt_orig_ext, NULL }; - static const int * nwk_route_command_options[] = { + static int * const nwk_route_command_options[] = { &hf_zbee_nwk_cmd_route_opt_repair, NULL }; @@ -1115,7 +1115,7 @@ dissect_zbee_nwk_status(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui static guint dissect_zbee_nwk_leave(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * leave_options[] = { + static int * const leave_options[] = { &hf_zbee_nwk_cmd_leave_rejoin, &hf_zbee_nwk_cmd_leave_request, &hf_zbee_nwk_cmd_leave_children, @@ -1181,7 +1181,7 @@ dissect_zbee_nwk_route_rec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static guint dissect_zbee_nwk_rejoin_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, zbee_nwk_packet * packet, guint offset) { - static const int * capabilities[] = { + static int * const capabilities[] = { &hf_zbee_nwk_cmd_cinfo_alt_coord, &hf_zbee_nwk_cmd_cinfo_type, &hf_zbee_nwk_cmd_cinfo_power, @@ -1253,7 +1253,7 @@ dissect_zbee_nwk_link_status(tvbuff_t *tvb, proto_tree *tree, guint offset) guint8 options; int i, link_count; proto_tree *subtree; - static const int * link_options[] = { + static int * const link_options[] = { &hf_zbee_nwk_cmd_link_last, &hf_zbee_nwk_cmd_link_first, &hf_zbee_nwk_cmd_link_count, @@ -1315,7 +1315,7 @@ dissect_zbee_nwk_ed_timeout_request(tvbuff_t *tvb, proto_tree *tree, guint offse static guint dissect_zbee_nwk_ed_timeout_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { - static const int * end_device_parent_info[] = { + static int * const end_device_parent_info[] = { &hf_zbee_nwk_cmd_prnt_info_mac_data_poll_keepalive_supported, &hf_zbee_nwk_cmd_prnt_info_ed_to_req_keepalive_supported, &hf_zbee_nwk_cmd_prnt_info_power_negotiation_supported, @@ -1526,7 +1526,7 @@ static int dissect_zbee_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint8 version; guint32 profile; - static const int * beacon_fields[] = { + static int * const beacon_fields[] = { &hf_zbee_beacon_stack_profile, &hf_zbee_beacon_version, &hf_zbee_beacon_router_capacity, @@ -1699,7 +1699,7 @@ dissect_zbee_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) guint pie_length; guint offset = 0; - static const int * fields[] = { + static int * const fields[] = { &hf_ieee802154_zigbee_ie_id, &hf_ieee802154_zigbee_ie_length, NULL diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 1ccad8a32c..ed65a59450 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -447,7 +447,7 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o ieee802154_hints_t *ieee_hints; ieee802154_map_rec *map_rec = NULL; - static const int * sec_flags[] = { + static int * const sec_flags[] = { &hf_zbee_sec_key_id, &hf_zbee_sec_nonce, NULL diff --git a/epan/dissectors/packet-zbee-zcl-closures.c b/epan/dissectors/packet-zbee-zcl-closures.c index 76688c8010..b4d78ccc09 100644 --- a/epan/dissectors/packet-zbee-zcl-closures.c +++ b/epan/dissectors/packet-zbee-zcl-closures.c @@ -135,7 +135,7 @@ dissect_zbee_zcl_shade_configuration(tvbuff_t *tvb _U_, packet_info *pinfo _U_, void dissect_zcl_shade_configuration_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * shade_config_status[] = { + static int * const shade_config_status[] = { &hf_zbee_zcl_shade_configuration_status_shade_operational, &hf_zbee_zcl_shade_configuration_status_shade_adjusting, &hf_zbee_zcl_shade_configuration_status_shade_direction, diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 9ee7200bd5..dec9b62a5d 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -237,14 +237,14 @@ void dissect_zcl_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * alarm_mask[] = { + static int * const alarm_mask[] = { &hf_zbee_zcl_basic_alarm_mask_gen_hw_fault, &hf_zbee_zcl_basic_alarm_mask_gen_sw_fault, &hf_zbee_zcl_basic_alarm_mask_reserved, NULL }; - static const int * local_cfg[] = { + static int * const local_cfg[] = { &hf_zbee_zcl_basic_disable_local_cfg_reset, &hf_zbee_zcl_basic_disable_local_cfg_device_cfg, &hf_zbee_zcl_basic_disable_local_cfg_reserved, @@ -659,14 +659,14 @@ void dissect_zcl_power_config_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { proto_item *it; - static const int * mains_alarm_mask[] = { + static int * const mains_alarm_mask[] = { &hf_zbee_zcl_power_config_mains_alarm_mask_low, &hf_zbee_zcl_power_config_mains_alarm_mask_high, &hf_zbee_zcl_power_config_mains_alarm_mask_reserved, NULL }; - static const int * batt_alarm_mask[] = { + static int * const batt_alarm_mask[] = { &hf_zbee_zcl_power_config_batt_alarm_mask_low, &hf_zbee_zcl_power_config_batt_alarm_mask_reserved, NULL @@ -995,7 +995,7 @@ dissect_zbee_zcl_device_temperature_configuration(tvbuff_t *tvb _U_, packet_info void dissect_zcl_device_temperature_configuration_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * device_temp_alarm_mask[] = { + static int * const device_temp_alarm_mask[] = { &hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_too_low, &hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_too_high, &hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_reserved, @@ -3360,7 +3360,7 @@ dissect_zbee_zcl_on_off(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi gint rem_len; guint8 effect_identifier = 0; - static const int * onoff_control_mask[] = { + static int * const onoff_control_mask[] = { &hf_zbee_zcl_on_off_timed_off_control_mask_accept_only_when_on, &hf_zbee_zcl_on_off_timed_off_control_mask_reserved, NULL @@ -4240,7 +4240,7 @@ static const value_string zbee_zcl_time_attr_names[] = { static void dissect_zcl_time_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * time_status_mask[] = { + static int * const time_status_mask[] = { &hf_zbee_zcl_time_status_master, &hf_zbee_zcl_time_status_synchronized, &hf_zbee_zcl_time_status_master_zone_dst, @@ -5276,7 +5276,7 @@ dissect_zcl_rssi_location_get_location_data(tvbuff_t *tvb, proto_tree *tree, gui { guint8 header; - static const int * location_header_fields[] = { + static int * const location_header_fields[] = { &hf_zbee_zcl_rssi_location_header_abs_only, &hf_zbee_zcl_rssi_location_header_recalc, &hf_zbee_zcl_rssi_location_header_bcast_ind, @@ -5764,7 +5764,7 @@ dissect_zcl_rssi_location_request_own_location(tvbuff_t *tvb, proto_tree *tree, void dissect_zcl_rssi_location_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int *location_type[] = { + static int * const location_type[] = { &hf_zbee_zcl_rssi_location_location_type_absolute, &hf_zbee_zcl_rssi_location_location_type_2D, &hf_zbee_zcl_rssi_location_location_type_coordinate_system, @@ -6173,7 +6173,7 @@ dissect_zbee_zcl_analog_input_basic(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p void dissect_zcl_analog_input_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_analog_input_basic_status_in_alarm, &hf_zbee_zcl_analog_input_basic_status_fault, &hf_zbee_zcl_analog_input_basic_status_overridden, @@ -6430,7 +6430,7 @@ dissect_zcl_analog_output_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint proto_tree *sub_tree = NULL, *sub = NULL; int i; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_analog_output_basic_status_in_alarm, &hf_zbee_zcl_analog_output_basic_status_fault, &hf_zbee_zcl_analog_output_basic_status_overridden, @@ -6716,7 +6716,7 @@ dissect_zcl_analog_value_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint proto_tree *sub_tree = NULL, *sub = NULL; int i; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_analog_value_basic_status_in_alarm, &hf_zbee_zcl_analog_value_basic_status_fault, &hf_zbee_zcl_analog_value_basic_status_overridden, @@ -6994,7 +6994,7 @@ dissect_zbee_zcl_binary_input_basic(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p void dissect_zcl_binary_input_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_binary_input_basic_status_in_alarm, &hf_zbee_zcl_binary_input_basic_status_fault, &hf_zbee_zcl_binary_input_basic_status_overridden, @@ -7265,7 +7265,7 @@ dissect_zcl_binary_output_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint proto_tree *sub_tree = NULL, *sub = NULL; int i; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_binary_output_basic_status_in_alarm, &hf_zbee_zcl_binary_output_basic_status_fault, &hf_zbee_zcl_binary_output_basic_status_overridden, @@ -7563,7 +7563,7 @@ dissect_zcl_binary_value_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint proto_tree *sub_tree = NULL, *sub = NULL; int i; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_binary_value_basic_status_in_alarm, &hf_zbee_zcl_binary_value_basic_status_fault, &hf_zbee_zcl_binary_value_basic_status_overridden, @@ -7835,7 +7835,7 @@ dissect_zbee_zcl_multistate_input_basic(tvbuff_t *tvb _U_, packet_info *pinfo _U void dissect_zcl_multistate_input_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_multistate_input_basic_status_in_alarm, &hf_zbee_zcl_multistate_input_basic_status_fault, &hf_zbee_zcl_multistate_input_basic_status_overridden, @@ -8089,7 +8089,7 @@ dissect_zcl_multistate_output_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, g proto_tree *sub_tree = NULL, *sub = NULL; int i; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_multistate_output_basic_status_in_alarm, &hf_zbee_zcl_multistate_output_basic_status_fault, &hf_zbee_zcl_multistate_output_basic_status_overridden, @@ -8379,7 +8379,7 @@ dissect_zcl_multistate_value_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, gu proto_tree *sub_tree = NULL, *sub = NULL; int i; - static const int * status_flags[] = { + static int * const status_flags[] = { &hf_zbee_zcl_multistate_value_basic_status_in_alarm, &hf_zbee_zcl_multistate_value_basic_status_fault, &hf_zbee_zcl_multistate_value_basic_status_overridden, @@ -8826,7 +8826,7 @@ dissect_zbee_zcl_commissioning(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr static void dissect_zcl_commissioning_restart_device(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * restart_device_mask[] = { + static int * const restart_device_mask[] = { &hf_zbee_zcl_commissioning_restart_device_options_startup_mode, &hf_zbee_zcl_commissioning_restart_device_options_immediate, &hf_zbee_zcl_commissioning_restart_device_options_reserved, @@ -8890,7 +8890,7 @@ dissect_zcl_commissioning_save_restore_startup_parameters(tvbuff_t *tvb, proto_t static void dissect_zcl_commissioning_reset_startup_parameters(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * reset_startup_mask[] = { + static int * const reset_startup_mask[] = { &hf_zbee_zcl_commissioning_reset_startup_options_reset_current, &hf_zbee_zcl_commissioning_reset_startup_options_reset_all, &hf_zbee_zcl_commissioning_reset_startup_options_erase_index, @@ -9385,7 +9385,7 @@ static void dissect_zcl_part_trasfpartframe(tvbuff_t *tvb, proto_tree *tree, gui guint8 options; gint frame_len; - static const int * part_opt[] = { + static int * const part_opt[] = { &hf_zbee_zcl_part_opt_first_block, &hf_zbee_zcl_part_opt_indic_len, &hf_zbee_zcl_part_opt_res, @@ -9495,7 +9495,7 @@ dissect_zcl_part_multiack(tvbuff_t *tvb, proto_tree *tree, guint *offset) guint16 first_frame_id; guint16 nack_id; - static const int * ack_opts[] = { + static int * const ack_opts[] = { &hf_zbee_zcl_part_ack_opt_nack_id_len, &hf_zbee_zcl_part_ack_opt_res, NULL @@ -10049,7 +10049,7 @@ decode_zcl_ota_size_in_bytes(gchar *s, guint32 value) static void dissect_zcl_ota_file_version_field(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * file_version[] = { + static int * const file_version[] = { &hf_zbee_zcl_ota_file_version_appl_release, &hf_zbee_zcl_ota_file_version_appl_build, &hf_zbee_zcl_ota_file_version_stack_release, @@ -10078,13 +10078,13 @@ dissect_zcl_ota_file_version_field(tvbuff_t *tvb, proto_tree *tree, guint *offse * guint *offset - pointer to buffer offset * int hf_hdr - hf_hdr * gint ett - ett subtree index - * const int** fields - fields an array of pointers to int that lists all the fields of the bitmask + * int* const *fields - fields an array of pointers to int that lists all the fields of the bitmask * RETURNS * guint8 - field ctrl value *--------------------------------------------------------------- */ static guint8 -dissect_zcl_ota_field_ctrl_field(tvbuff_t *tvb, proto_tree *tree, guint *offset, int hf_hdr, gint ett, const int **fields) +dissect_zcl_ota_field_ctrl_field(tvbuff_t *tvb, proto_tree *tree, guint *offset, int hf_hdr, gint ett, int * const *fields) { guint8 field; @@ -10160,7 +10160,7 @@ dissect_zcl_ota_imagenotify(tvbuff_t *tvb, proto_tree *tree, guint *offset) static void dissect_zcl_ota_querynextimagereq(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * fields[] = { + static int * const fields[] = { &hf_zbee_zcl_ota_query_next_image_req_field_ctrl_hw_ver_present, &hf_zbee_zcl_ota_query_next_image_req_field_ctrl_reserved, NULL @@ -10249,7 +10249,7 @@ dissect_zcl_ota_querynextimagersp(tvbuff_t *tvb, proto_tree *tree, guint *offset static void dissect_zcl_ota_imageblockreq(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * fields[] = { + static int * const fields[] = { &hf_zbee_zcl_ota_image_block_req_field_ctrl_ieee_addr_present, &hf_zbee_zcl_ota_image_block_req_field_ctrl_min_block_period_present, &hf_zbee_zcl_ota_image_block_req_field_ctrl_reserved, @@ -10309,7 +10309,7 @@ dissect_zcl_ota_imageblockreq(tvbuff_t *tvb, proto_tree *tree, guint *offset) static void dissect_zcl_ota_imagepagereq(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * fields[] = { + static int * const fields[] = { &hf_zbee_zcl_ota_image_page_req_field_ctrl_ieee_addr_present, &hf_zbee_zcl_ota_image_page_req_field_ctrl_reserved, NULL @@ -11691,7 +11691,7 @@ dissect_zcl_pwr_prof_pwrprofschedcontrsnotif(tvbuff_t *tvb, proto_tree *tree, gu static void dissect_zcl_pwr_prof_pwrprofpriceext(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * options[] = { + static int * const options[] = { &hf_zbee_zcl_pwr_prof_options_01, &hf_zbee_zcl_pwr_prof_options_res, NULL @@ -11732,13 +11732,13 @@ dissect_zcl_pwr_prof_pwrprofpriceext(tvbuff_t *tvb, proto_tree *tree, guint *off static void dissect_zcl_pwr_prof_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * format_fields[] = { + static int * const format_fields[] = { &hf_zbee_zcl_pwr_prof_energy_format_rdigit, &hf_zbee_zcl_pwr_prof_energy_format_ldigit, &hf_zbee_zcl_pwr_prof_energy_format_noleadingzero, NULL }; - static const int * modes[] = { + static int * const modes[] = { &hf_zbee_zcl_pwr_prof_sched_mode_cheapest, &hf_zbee_zcl_pwr_prof_sched_mode_greenest, &hf_zbee_zcl_pwr_prof_sched_mode_reserved, @@ -12586,7 +12586,7 @@ dissect_zcl_appl_ctrl_ovrl_warning(tvbuff_t *tvb, proto_tree *tree, guint *offse static void dissect_zcl_appl_ctrl_signal_state_rsp(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * flags[] = { + static int * const flags[] = { &hf_zbee_zcl_appl_ctrl_rem_en_flags, &hf_zbee_zcl_appl_ctrl_status2, NULL @@ -12624,7 +12624,7 @@ dissect_zcl_appl_ctrl_signal_state_rsp(tvbuff_t *tvb, proto_tree *tree, guint *o static void dissect_zcl_appl_ctrl_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * flags[] = { + static int * const flags[] = { &hf_zbee_zcl_appl_ctrl_time_mm, &hf_zbee_zcl_appl_ctrl_time_encoding_type, &hf_zbee_zcl_appl_ctrl_time_hh, @@ -13839,7 +13839,7 @@ dissect_zbee_zcl_gp_sink_table_entry(tvbuff_t *tvb, proto_tree *tree, guint *off guint16 options = 0; guint16 app_id, comm_mode; proto_tree *subtree; - static const int * n_options[] = { + static int * const n_options[] = { &hf_zbee_gp_sink_tbl_entry_options_app_id, &hf_zbee_gp_sink_tbl_entry_options_comm_mode, &hf_zbee_gp_sink_tbl_entry_options_seq_num_cap, @@ -13849,7 +13849,7 @@ dissect_zbee_zcl_gp_sink_table_entry(tvbuff_t *tvb, proto_tree *tree, guint *off &hf_zbee_gp_sink_tbl_entry_options_sec_use, NULL }; - static const int * n_secur_options[] = { + static int * const n_secur_options[] = { &hf_zbee_gp_sec_options_sec_level, &hf_zbee_gp_sec_options_sec_key_type, NULL @@ -13991,7 +13991,7 @@ dissect_zbee_zcl_gp_proxy_table_entry(tvbuff_t *tvb, proto_tree *tree, guint *of guint16 ext_options = 0; guint16 app_id; proto_tree *subtree; - static const int * n_options[] = { + static int * const n_options[] = { &hf_zbee_gp_proxy_tbl_entry_options_app_id, &hf_zbee_gp_proxy_tbl_entry_options_entry_active, &hf_zbee_gp_proxy_tbl_entry_options_entry_valid, @@ -14008,11 +14008,11 @@ dissect_zbee_zcl_gp_proxy_table_entry(tvbuff_t *tvb, proto_tree *tree, guint *of &hf_zbee_gp_proxy_tbl_entry_options_opt_ext, NULL }; - static const int * n_ext_options[] = { + static int * const n_ext_options[] = { &hf_zbee_gp_proxy_tbl_entry_ext_options_full_ucast_gps, NULL }; - static const int * n_secur_options[] = { + static int * const n_secur_options[] = { &hf_zbee_gp_sec_options_sec_level, &hf_zbee_gp_sec_options_sec_key_type, NULL @@ -14167,7 +14167,7 @@ dissect_zbee_zcl_gp_proxy_table(tvbuff_t *tvb, proto_tree *tree, guint offset) static int dissect_zbee_zcl_gp_attr_gpp_functionality(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gpp_func_fld_gp_feature, &hf_zbee_zcl_gp_attr_gpp_func_fld_direct_comm, &hf_zbee_zcl_gp_attr_gpp_func_fld_derived_gcast_comm, @@ -14208,7 +14208,7 @@ dissect_zbee_zcl_gp_attr_gpp_functionality(tvbuff_t *tvb, proto_tree *tree, guin static int dissect_zbee_zcl_gp_attr_gpp_active_functionality(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gpp_active_func_fld_gp_functionality, NULL }; @@ -14234,7 +14234,7 @@ dissect_zbee_zcl_gp_attr_gpp_active_functionality(tvbuff_t *tvb, proto_tree *tre static int dissect_zbee_zcl_gp_attr_gps_functionality(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gps_func_fld_gp_feature, &hf_zbee_zcl_gp_attr_gps_func_fld_direct_comm, &hf_zbee_zcl_gp_attr_gps_func_fld_derived_gcast_comm, @@ -14279,7 +14279,7 @@ dissect_zbee_zcl_gp_attr_gps_functionality(tvbuff_t *tvb, proto_tree *tree, guin static int dissect_zbee_zcl_gp_attr_gps_active_functionality(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gps_active_func_fld_gp_functionality, NULL }; @@ -14305,7 +14305,7 @@ dissect_zbee_zcl_gp_attr_gps_active_functionality(tvbuff_t *tvb, proto_tree *tre static int dissect_zbee_zcl_gp_attr_gps_communication_mode(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gps_communication_mode_fld_mode, NULL }; @@ -14331,7 +14331,7 @@ dissect_zbee_zcl_gp_attr_gps_communication_mode(tvbuff_t *tvb, proto_tree *tree, static int dissect_zbee_zcl_gp_attr_gps_comm_exit_mode(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_comm_window_expire, &hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_pairing_success, &hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_gp_proxy_comm_mode, @@ -14359,7 +14359,7 @@ dissect_zbee_zcl_gp_attr_gps_comm_exit_mode(tvbuff_t *tvb, proto_tree *tree, gui static int dissect_zbee_zcl_gp_attr_gps_secur_lvl(tvbuff_t *tvb, proto_tree *tree, guint offset) { - static const int * n_fields[] = { + static int * const n_fields[] = { &hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_min_gpd_secur_lvl, &hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_protection_with_gp_link_key, &hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_involve_tc, @@ -14389,7 +14389,7 @@ dissect_zcl_gp_proxy_sink_table_request(proto_tree *tree, tvbuff_t *tvb, guint * /* get Options field */ guint8 options = tvb_get_guint8(tvb, *offset); guint8 app_id, req_type; - static const int * n_options[] = { + static int * const n_options[] = { &hf_zbee_zcl_proxy_sink_tbl_req_fld_app_id, &hf_zbee_zcl_proxy_sink_tbl_req_fld_req_type, NULL @@ -14481,7 +14481,7 @@ dissect_zcl_gp_proxy_sink_table_response(proto_tree *tree, tvbuff_t *tvb, guint static void dissect_zcl_gp_sink_comm_mode(proto_tree *tree, tvbuff_t *tvb, guint *offset) { - static const int * n_options[] = { + static int * const n_options[] = { &hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_action, &hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_gpm_in_secur, &hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_gpm_in_pairing, @@ -14515,7 +14515,7 @@ dissect_zcl_gp_sink_comm_mode(proto_tree *tree, tvbuff_t *tvb, guint *offset) static int dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - static const int * gpp_gpd_link[] = { + static int * const gpp_gpd_link[] = { &hf_zbee_gpp_gpd_link_rssi, &hf_zbee_gpp_gpd_link_lqi, NULL @@ -14545,7 +14545,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d switch (cmd_id) { case ZBEE_CMD_ID_GP_NOTIFICATION: { - static const int * n_options[] = { + static int * const n_options[] = { &hf_zbee_gp_cmd_notif_opt_app_id, &hf_zbee_gp_cmd_notif_opt_also_unicast, &hf_zbee_gp_cmd_notif_opt_also_derived_group, @@ -14596,7 +14596,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case ZBEE_CMD_ID_GP_COMMISSIONING_NOTIFICATION: { - static const int * commn_options[] = { + static int * const commn_options[] = { &hf_zbee_gp_cmd_comm_notif_opt_app_id, &hf_zbee_gp_cmd_comm_notif_opt_rx_after_tx, &hf_zbee_gp_cmd_comm_notif_opt_secur_level, @@ -14643,12 +14643,12 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case ZBEE_CMD_ID_GP_PAIRING_CONFIGURATION: { - static const int * pc_actions[] = { + static int * const pc_actions[] = { &hf_zbee_gp_cmd_pc_actions_action, &hf_zbee_gp_cmd_pc_actions_send_gp_pairing, NULL }; - static const int * pc_options[] = { + static int * const pc_options[] = { &hf_zbee_gp_cmd_pc_opt_app_id, &hf_zbee_gp_cmd_pc_opt_communication_mode, &hf_zbee_gp_cmd_pc_opt_seq_number_cap, @@ -14711,7 +14711,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d offset += 1; if (options & ZBEE_ZCL_GP_CMD_PC_OPT_SECURITY_USE) { - static const int * secur_options[] = { + static int * const secur_options[] = { &hf_zbee_gp_cmd_pc_secur_level, &hf_zbee_gp_cmd_pc_secur_key_type, NULL @@ -14741,7 +14741,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d } } if (options & ZBEE_ZCL_GP_CMD_PC_OPT_APP_INFO_PRESENT) { - static const int * app_info[] = { + static int * const app_info[] = { &hf_zbee_gp_cmd_pc_app_info_manuf_id_present, &hf_zbee_gp_cmd_pc_app_info_model_id_present, &hf_zbee_gp_cmd_pc_app_info_gpd_commands_present, @@ -14841,7 +14841,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case ZBEE_ZCL_CMD_ID_GP_PAIRING: { - static const int * p_options[] = { + static int * const p_options[] = { &hf_zbee_gp_cmd_pairing_opt_app_id, &hf_zbee_gp_cmd_pairing_opt_add_sink, &hf_zbee_gp_cmd_pairing_opt_remove_gpd, @@ -14910,7 +14910,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case ZBEE_ZCL_CMD_ID_GP_PROXY_COMMISSIONING_MODE: { - static const int * pcm_options[] = { + static int * const pcm_options[] = { &hf_zbee_gp_cmd_pcm_opt_action, &hf_zbee_gp_cmd_pcm_opt_exit_mode, &hf_zbee_gp_cmd_pcm_opt_channel_present, @@ -14921,7 +14921,7 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d proto_tree_add_bitmask(tree, tvb, offset, hf_zbee_gp_cmd_proxy_commissioning_mode_options, ett_zbee_gp_cmd_proxy_commissioning_mode_options, pcm_options, ENC_NA); if (options & ZBEE_ZCL_GP_PROXY_COMMISSIONING_MODE_OPTION_ACTION) { - static const int * exit_mode[] = { + static int * const exit_mode[] = { &hf_zbee_gp_cmd_pcm_exit_mode_on_comm_window_expire, &hf_zbee_gp_cmd_pcm_exit_mode_on_pairing_success, &hf_zbee_gp_cmd_pcm_exit_mode_on_gp_proxy_comm_mode, @@ -14944,12 +14944,12 @@ dissect_zbee_zcl_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d case ZBEE_ZCL_CMD_ID_GP_RESPONSE: { - static const int * rsp_options[] = { + static int * const rsp_options[] = { &hf_zbee_gp_cmd_resp_opt_app_id, &hf_zbee_gp_cmd_resp_opt_tx_on_ep_match, NULL }; - static const int * tx_ch[] = { + static int * const tx_ch[] = { &hf_zbee_gp_cmd_resp_tx_channel, NULL }; @@ -15976,12 +15976,12 @@ static const value_string zbee_zcl_touchlink_keyid_names[] = { static void dissect_zcl_touchlink_scan_request(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * zbee_info_flags[] = { + static int * const zbee_info_flags[] = { &hf_zbee_zcl_touchlink_zbee_type, &hf_zbee_zcl_touchlink_zbee_rxidle, NULL }; - static const int * zll_info_flags[] = { + static int * const zll_info_flags[] = { &hf_zbee_zcl_touchlink_info_factory, &hf_zbee_zcl_touchlink_info_assignment, &hf_zbee_zcl_touchlink_info_initiator, @@ -16118,19 +16118,19 @@ dissect_zcl_touchlink_network_update_request(tvbuff_t *tvb, proto_tree *tree, gu static void dissect_zcl_touchlink_scan_response(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int * zbee_info_flags[] = { + static int * const zbee_info_flags[] = { &hf_zbee_zcl_touchlink_zbee_type, &hf_zbee_zcl_touchlink_zbee_rxidle, NULL }; - static const int * zll_info_flags[] = { + static int * const zll_info_flags[] = { &hf_zbee_zcl_touchlink_info_factory, &hf_zbee_zcl_touchlink_info_assignment, &hf_zbee_zcl_touchlink_info_initiator, &hf_zbee_zcl_touchlink_info_undefined, NULL }; - static const int * zll_keybit_flags[] = { + static int * const zll_keybit_flags[] = { &hf_zbee_zcl_touchlink_key_bit_dev, &hf_zbee_zcl_touchlink_key_bit_master, &hf_zbee_zcl_touchlink_key_bit_cert, diff --git a/epan/dissectors/packet-zbee-zcl-hvac.c b/epan/dissectors/packet-zbee-zcl-hvac.c index 5b05ad4071..ae29d2e1b4 100644 --- a/epan/dissectors/packet-zbee-zcl-hvac.c +++ b/epan/dissectors/packet-zbee-zcl-hvac.c @@ -223,7 +223,7 @@ dissect_zbee_zcl_pump_config_control(tvbuff_t *tvb _U_, packet_info *pinfo _U_, void dissect_zcl_pump_config_control_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * pump_status[] = { + static int * const pump_status[] = { &hf_zbee_zcl_pump_config_control_status_device_fault, &hf_zbee_zcl_pump_config_control_status_supply_fault, &hf_zbee_zcl_pump_config_control_status_speed_low, @@ -236,7 +236,7 @@ dissect_zcl_pump_config_control_attr_data(proto_tree *tree, tvbuff_t *tvb, guint NULL }; - static const int * alarm_mask[] = { + static int * const alarm_mask[] = { &hf_zbee_zcl_pump_config_control_alarm_volt_too_low, &hf_zbee_zcl_pump_config_control_alarm_volt_too_high, &hf_zbee_zcl_pump_config_control_alarm_pwr_missing_phase, diff --git a/epan/dissectors/packet-zbee-zcl-lighting.c b/epan/dissectors/packet-zbee-zcl-lighting.c index 3c8d8bd8d4..bdf72e30b4 100644 --- a/epan/dissectors/packet-zbee-zcl-lighting.c +++ b/epan/dissectors/packet-zbee-zcl-lighting.c @@ -755,7 +755,7 @@ dissect_zcl_color_control_move_to_color_temp(tvbuff_t *tvb, proto_tree *tree, gu static void dissect_zcl_color_control_color_loop_set(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - static const int *color_loop_update_fields[] = { + static int * const color_loop_update_fields[] = { &hf_zbee_zcl_color_control_color_loop_update_action, &hf_zbee_zcl_color_control_color_loop_update_direction, &hf_zbee_zcl_color_control_color_loop_update_time, @@ -926,7 +926,7 @@ decode_startup_color_temperature(gchar *s, guint16 value) void dissect_zcl_color_control_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int *capabilities_fields[] = { + static int * const capabilities_fields[] = { &hf_zbee_zcl_color_control_attr_color_capabilities_hs, &hf_zbee_zcl_color_control_attr_color_capabilities_ehs, &hf_zbee_zcl_color_control_attr_color_capabilities_loop, @@ -1722,13 +1722,13 @@ dissect_zbee_zcl_ballast_configuration(tvbuff_t *tvb _U_, packet_info *pinfo _U_ void dissect_zcl_ballast_configuration_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int * ballast_status[] = { + static int * const ballast_status[] = { &hf_zbee_zcl_ballast_configuration_status_non_operational, &hf_zbee_zcl_ballast_configuration_status_lamp_not_in_socket, NULL }; - static const int * lamp_alarm_mode[] = { + static int * const lamp_alarm_mode[] = { &hf_zbee_zcl_ballast_configuration_lamp_alarm_mode_lamp_burn_hours, NULL }; diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c index 2684a75472..d53b55da69 100644 --- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c +++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c @@ -1776,7 +1776,7 @@ dissect_zbee_zcl_occ_sen(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree * static void dissect_zcl_occ_sen_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint16 attr_id, guint data_type, gboolean client_attr) { - static const int *occupancy[] = { + static int * const occupancy[] = { &hf_zbee_zcl_occ_sen_occupancy_occupied, NULL }; diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c index aea6bc4311..daf4f406bd 100644 --- a/epan/dissectors/packet-zbee-zcl-misc.c +++ b/epan/dissectors/packet-zbee-zcl-misc.c @@ -247,7 +247,7 @@ static void dissect_zcl_thermostat_schedule_days(proto_tree *tree, tvbuff_t *tvb, guint offset) { - static const int *thermostat_schedule_days[] = { + static int * const thermostat_schedule_days[] = { &hf_zbee_zcl_thermostat_schedule_day_sunday, &hf_zbee_zcl_thermostat_schedule_day_monday, &hf_zbee_zcl_thermostat_schedule_day_tuesday, @@ -275,7 +275,7 @@ static void dissect_zcl_thermostat_schedule_mode(proto_tree *tree, tvbuff_t *tvb, guint offset) { - static const int *thermostat_schedule_modes[] = { + static int * const thermostat_schedule_modes[] = { &hf_zbee_zcl_thermostat_schedule_mode_heat, &hf_zbee_zcl_thermostat_schedule_mode_cool, NULL @@ -763,7 +763,7 @@ static void dissect_zcl_ias_zone_status (proto_tree *tree, tvbuff_t *tvb, gu static void dissect_zcl_ias_zone_status(proto_tree *tree, tvbuff_t *tvb, guint offset) { - static const int *ias_zone_statuses[] = { + static int * const ias_zone_statuses[] = { &hf_zbee_zcl_ias_zone_status_alarm1, &hf_zbee_zcl_ias_zone_status_alarm2, &hf_zbee_zcl_ias_zone_status_tamper, diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index f99ee63387..f4e14135d3 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -1619,25 +1619,25 @@ static gint ett_zbee_zcl_price_co2_value_trailing_digit = -1; static gint ett_zbee_zcl_price_billing_period_duration_type = -1; static gint ett_zbee_zcl_price_consolidated_bill_trailing_digit = -1; -static const int * zbee_zcl_price_billing_period_duration_type[] = { +static int * const zbee_zcl_price_billing_period_duration_type[] = { &hf_zbee_zcl_price_billing_period_duration_timebase, &hf_zbee_zcl_price_billing_period_duration_control, NULL }; -static const int * zbee_zcl_price_block_period_duration_type[] = { +static int * const zbee_zcl_price_block_period_duration_type[] = { &hf_zbee_zcl_price_block_period_duration_timebase, &hf_zbee_zcl_price_block_period_duration_control, NULL }; -static const int * zbee_zcl_price_block_period_control[] = { +static int * const zbee_zcl_price_block_period_control[] = { &hf_zbee_zcl_price_block_period_control_price_acknowledgement, &hf_zbee_zcl_price_block_period_control_repeating_block, NULL }; -static const int * zbee_zcl_price_tariff_type_mask[] = { +static int * const zbee_zcl_price_tariff_type_mask[] = { &hf_zbee_zcl_price_tariff_type, NULL }; @@ -2257,19 +2257,19 @@ dissect_zcl_price_publish_price(tvbuff_t *tvb, proto_tree *tree, guint *offset) nstime_t current_time; int length; - static const int * trailing_digit[] = { + static int * const trailing_digit[] = { &hf_zbee_zcl_price_tier, &hf_zbee_zcl_price_trailing_digit, NULL }; - static const int * number_of_price_tiers_and_register_tier[] = { + static int * const number_of_price_tiers_and_register_tier[] = { &hf_zbee_zcl_price_register_tier, &hf_zbee_zcl_price_number_of_price_tiers, NULL }; - static const int * alternate_cost_trailing_digit[] = { + static int * const alternate_cost_trailing_digit[] = { &hf_zbee_zcl_price_alternate_cost_trailing_digit, NULL }; @@ -2447,7 +2447,7 @@ dissect_zcl_price_publish_conversion_factor(tvbuff_t *tvb, proto_tree *tree, gui { nstime_t start_time; - static const int * conversion_factor_trailing_digit[] = { + static int * const conversion_factor_trailing_digit[] = { &hf_zbee_zcl_price_conversion_factor_trailing_digit, NULL }; @@ -2483,7 +2483,7 @@ dissect_zcl_price_publish_calorific_value(tvbuff_t *tvb, proto_tree *tree, guint { nstime_t start_time; - static const int * calorific_value_trailing_digit[] = { + static int * const calorific_value_trailing_digit[] = { &hf_zbee_zcl_price_calorific_value_trailing_digit, NULL }; @@ -2524,12 +2524,12 @@ dissect_zcl_price_publish_tariff_information(tvbuff_t *tvb, proto_tree *tree, gu int length; nstime_t start_time; - static const int * price_trailing_digit[] = { + static int * const price_trailing_digit[] = { &hf_zbee_zcl_price_tariff_information_price_trailing_digit, NULL }; - static const int * type_and_charging_scheme[] = { + static int * const type_and_charging_scheme[] = { &hf_zbee_zcl_price_tariff_information_type, &hf_zbee_zcl_price_tariff_information_charging_scheme, NULL @@ -2611,7 +2611,7 @@ dissect_zcl_price_publish_price_matrix(tvbuff_t *tvb, proto_tree *tree, guint *o guint8 sub_payload_control; nstime_t start_time; - static const int * tier_block_id[] = { + static int * const tier_block_id[] = { &hf_zbee_zcl_price_price_matrix_tier_block_id_block, &hf_zbee_zcl_price_price_matrix_tier_block_id_tier, NULL @@ -2675,13 +2675,13 @@ dissect_zcl_price_publish_block_thresholds(tvbuff_t *tvb, proto_tree *tree, guin guint8 sub_payload_control; nstime_t start_time; - static const int * tier_number_of_block_thresholds[] = { + static int * const tier_number_of_block_thresholds[] = { &hf_zbee_zcl_price_block_thresholds_number_of_block_thresholds, &hf_zbee_zcl_price_block_thresholds_tier, NULL }; - static const int * number_of_block_thresholds[] = { + static int * const number_of_block_thresholds[] = { &hf_zbee_zcl_price_block_thresholds_number_of_block_thresholds, NULL }; @@ -2748,7 +2748,7 @@ dissect_zcl_price_publish_co2_value(tvbuff_t *tvb, proto_tree *tree, guint *offs { nstime_t start_time; - static const int * co2_value_trailing_digit[] = { + static int * const co2_value_trailing_digit[] = { &hf_zbee_zcl_price_co2_value_trailing_digit, NULL }; @@ -2884,7 +2884,7 @@ dissect_zcl_price_publish_consolidated_bill(tvbuff_t *tvb, proto_tree *tree, gui { nstime_t start_time; - static const int * bill_trailing_digit[] = { + static int * const bill_trailing_digit[] = { &hf_zbee_zcl_price_consolidated_bill_trailing_digit, NULL }; @@ -3034,7 +3034,7 @@ dissect_zcl_price_publish_currency_conversion(tvbuff_t *tvb, proto_tree *tree, g { nstime_t start_time; - static const int * conversion_factor_trailing_digit[] = { + static int * const conversion_factor_trailing_digit[] = { &hf_zbee_zcl_price_conversion_factor_trailing_digit, NULL }; @@ -3809,7 +3809,7 @@ static int hf_zbee_zcl_drlc_get_scheduled_events_start_time = -1; static int hf_zbee_zcl_drlc_get_scheduled_events_number_of_events = -1; static int hf_zbee_zcl_drlc_get_scheduled_events_issuer_event_id = -1; -static const int* zbee_zcl_drlc_control_event_device_classes[] = { +static int* const zbee_zcl_drlc_control_event_device_classes[] = { &hf_zbee_zcl_drlc_device_class_hvac_compressor_or_furnace, &hf_zbee_zcl_drlc_device_class_strip_heaters_baseboard_heaters, &hf_zbee_zcl_drlc_device_class_water_heater, @@ -3826,14 +3826,14 @@ static const int* zbee_zcl_drlc_control_event_device_classes[] = { NULL }; -static const int* hf_zbee_zcl_drlc_event_control_flags[] = { +static int* const hf_zbee_zcl_drlc_event_control_flags[] = { &hf_zbee_zcl_drlc_event_control_randomize_start_time, &hf_zbee_zcl_drlc_event_control_randomize_duration_time, &hf_zbee_zcl_drlc_event_control_reserved, NULL }; -static const int* hf_zbee_zcl_drlc_cancel_control_flags[] = { +static int* const hf_zbee_zcl_drlc_cancel_control_flags[] = { &hf_zbee_zcl_drlc_cancel_control_event_in_process, &hf_zbee_zcl_drlc_cancel_control_reserved, NULL @@ -5836,14 +5836,14 @@ static int hf_zbee_zcl_met_snapshot_schedule_frequency = -1; static int hf_zbee_zcl_met_snapshot_schedule_frequency_type = -1; static int hf_zbee_zcl_met_snapshot_schedule_frequency_wild_card = -1; -static const int* zbee_zcl_met_snapshot_schedule_bits[] = { +static int* const zbee_zcl_met_snapshot_schedule_bits[] = { &hf_zbee_zcl_met_snapshot_schedule_frequency, &hf_zbee_zcl_met_snapshot_schedule_frequency_type, &hf_zbee_zcl_met_snapshot_schedule_frequency_wild_card, NULL }; -static const int* zbee_zcl_met_func_noti_flags[] = { +static int* const zbee_zcl_met_func_noti_flags[] = { &hf_zbee_zcl_met_func_noti_flag_new_ota_firmware, &hf_zbee_zcl_met_func_noti_flag_cbke_update_request, &hf_zbee_zcl_met_func_noti_flag_time_sync, @@ -5870,7 +5870,7 @@ static const int* zbee_zcl_met_func_noti_flags[] = { NULL }; -static const int* zbee_zcl_met_noti_flags_2[] = { +static int* const zbee_zcl_met_noti_flags_2[] = { &hf_zbee_zcl_met_noti_flag_2_publish_price, &hf_zbee_zcl_met_noti_flag_2_publish_block_period, &hf_zbee_zcl_met_noti_flag_2_publish_tariff_info, @@ -5890,7 +5890,7 @@ static const int* zbee_zcl_met_noti_flags_2[] = { NULL }; -static const int* zbee_zcl_met_noti_flags_3[] = { +static int* const zbee_zcl_met_noti_flags_3[] = { &hf_zbee_zcl_met_noti_flag_3_publish_calendar, &hf_zbee_zcl_met_noti_flag_3_publish_special_days, &hf_zbee_zcl_met_noti_flag_3_publish_seasons, @@ -5901,7 +5901,7 @@ static const int* zbee_zcl_met_noti_flags_3[] = { NULL }; -static const int* zbee_zcl_met_noti_flags_4[] = { +static int* const zbee_zcl_met_noti_flags_4[] = { &hf_zbee_zcl_met_noti_flag_4_select_available_emergency_credit, &hf_zbee_zcl_met_noti_flag_4_change_debt, &hf_zbee_zcl_met_noti_flag_4_emergency_credit_setup, @@ -5918,7 +5918,7 @@ static const int* zbee_zcl_met_noti_flags_4[] = { NULL }; -static const int* zbee_zcl_met_noti_flags_5[] = { +static int* const zbee_zcl_met_noti_flags_5[] = { &hf_zbee_zcl_met_noti_flag_5_publish_change_of_tenancy, &hf_zbee_zcl_met_noti_flag_5_publish_change_of_supplier, &hf_zbee_zcl_met_noti_flag_5_request_new_password_1_response, @@ -5932,7 +5932,7 @@ static const int* zbee_zcl_met_noti_flags_5[] = { NULL }; -static const int* zbee_zcl_met_snapshot_cause_flags[] = { +static int* const zbee_zcl_met_snapshot_cause_flags[] = { &hf_zbee_zcl_met_snapshot_cause_general, &hf_zbee_zcl_met_snapshot_cause_end_of_billing_period, &hf_zbee_zcl_met_snapshot_cause_end_of_block_period, @@ -8157,7 +8157,7 @@ dissect_zcl_msg_display(tvbuff_t *tvb, proto_tree *tree, guint *offset) { guint msg_len; - static const int * message_ctrl_flags[] = { + static int * const message_ctrl_flags[] = { &hf_zbee_zcl_msg_ctrl_tx, &hf_zbee_zcl_msg_ctrl_importance, &hf_zbee_zcl_msg_ctrl_enh_confirm, @@ -8166,7 +8166,7 @@ dissect_zcl_msg_display(tvbuff_t *tvb, proto_tree *tree, guint *offset) NULL }; - static const int * message_ext_ctrl_flags[] = { + static int * const message_ext_ctrl_flags[] = { &hf_zbee_zcl_msg_ext_ctrl_status, NULL }; @@ -9375,7 +9375,7 @@ static int hf_zbee_zcl_pp_snapshot_payload_cause_top_up_addition = -1; static int hf_zbee_zcl_pp_snapshot_payload_cause_debt_credit_addition = -1; static int hf_zbee_zcl_pp_snapshot_payload_cause_reserved = -1; -static const int* zbee_zcl_pp_payment_control_configuration_flags[] = { +static int* const zbee_zcl_pp_payment_control_configuration_flags[] = { &hf_zbee_zcl_pp_payment_control_configuration_disconnection_enabled, &hf_zbee_zcl_pp_payment_control_configuration_prepayment_enabled, &hf_zbee_zcl_pp_payment_control_configuration_credit_management_enabled, @@ -9390,7 +9390,7 @@ static const int* zbee_zcl_pp_payment_control_configuration_flags[] = { NULL }; -static const int* zbee_zcl_pp_snapshot_payload_cause_flags[] = { +static int* const zbee_zcl_pp_snapshot_payload_cause_flags[] = { &hf_zbee_zcl_pp_snapshot_payload_cause_general, &hf_zbee_zcl_pp_snapshot_payload_cause_end_of_billing_period, &hf_zbee_zcl_pp_snapshot_payload_cause_change_of_tariff_information, @@ -10690,7 +10690,7 @@ static int hf_zbee_zcl_energy_management_report_event_event_control_randomize_du static int hf_zbee_zcl_energy_management_report_event_event_control_reserved = -1; -static const int* zbee_zcl_energy_management_device_classes[] = { +static int* const zbee_zcl_energy_management_device_classes[] = { &hf_zbee_zcl_energy_management_device_class_hvac_compressor_or_furnace, &hf_zbee_zcl_energy_management_device_class_strip_heaters_baseboard_heaters, &hf_zbee_zcl_energy_management_device_class_water_heater, @@ -10707,7 +10707,7 @@ static const int* zbee_zcl_energy_management_device_classes[] = { NULL }; -static const int* zbee_zcl_energy_management_action_required[] = { +static int* const zbee_zcl_energy_management_action_required[] = { &hf_zbee_zcl_energy_management_action_required_opt_out_of_event, &hf_zbee_zcl_energy_management_action_required_opt_into_event, &hf_zbee_zcl_energy_management_action_required_disable_duty_cycling, @@ -10716,7 +10716,7 @@ static const int* zbee_zcl_energy_management_action_required[] = { NULL }; -static const int* hf_zbee_zcl_energy_management_event_control_flags[] = { +static int* const hf_zbee_zcl_energy_management_event_control_flags[] = { &hf_zbee_zcl_energy_management_report_event_event_control_randomize_start_time, &hf_zbee_zcl_energy_management_report_event_event_control_randomize_duration_time, &hf_zbee_zcl_energy_management_report_event_event_control_reserved, @@ -13276,7 +13276,7 @@ static int hf_zbee_zcl_device_management_update_cin_cin_implementation_time = -1 static int hf_zbee_zcl_device_management_update_cin_provider_id = -1; static int hf_zbee_zcl_device_management_update_cin_customerid_number = -1; -static const int* hf_zbee_zcl_device_management_event_configuration_flags[] = { +static int* const hf_zbee_zcl_device_management_event_configuration_flags[] = { &hf_zbee_zcl_device_management_event_configuration_logging, &hf_zbee_zcl_device_management_event_configuration_push_event_to_wan, &hf_zbee_zcl_device_management_event_configuration_push_event_to_han, @@ -13286,7 +13286,7 @@ static const int* hf_zbee_zcl_device_management_event_configuration_flags[] = { NULL }; -static const int* hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_flags[] = { +static int* const hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_flags[] = { &hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_pre_snapshot, &hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_post_snapshot, &hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_credit_register, diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c index 43d6c62744..659bb6be1c 100644 --- a/epan/dissectors/packet-zbee-zdp-management.c +++ b/epan/dissectors/packet-zbee-zdp-management.c @@ -292,7 +292,7 @@ dissect_zbee_zdp_req_mgmt_leave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t { guint offset = 0; guint64 ext_addr; - static const int * flags[] = { + static int * const flags[] = { &hf_zbee_zdp_leave_children, &hf_zbee_zdp_leave_rejoin, NULL diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 97682ab5e7..7be69b1379 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -662,7 +662,7 @@ guint8 zdp_parse_cinfo(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset) { guint8 flags; - static const int * cinfo[] = { + static int * const cinfo[] = { &hf_zbee_zdp_cinfo_alt_coord, &hf_zbee_zdp_cinfo_ffd, &hf_zbee_zdp_cinfo_power, @@ -692,7 +692,7 @@ guint16 zdp_parse_server_flags(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset) { guint16 flags; - static const int * server_flags[] = { + static int * const server_flags[] = { &hf_zbee_zdp_server_pri_trust, &hf_zbee_zdp_server_bak_trust, &hf_zbee_zdp_server_pri_bind, @@ -732,7 +732,7 @@ zdp_parse_node_desc(proto_tree *tree, packet_info *pinfo, gboolean show_ver_flag /*guint16 mfr_code;*/ /*guint8 max_buff;*/ /*guint16 max_transfer;*/ - static const int * nodes[] = { + static int * const nodes[] = { &hf_zbee_zdp_node_complex, &hf_zbee_zdp_node_user, &hf_zbee_zdp_node_freq_868, @@ -776,7 +776,7 @@ zdp_parse_node_desc(proto_tree *tree, packet_info *pinfo, gboolean show_ver_flag /* Get and display the server flags. */ if (version >= ZBEE_VERSION_2007) { guint16 ver_flags; - const int * descriptors[] = { + static int * const descriptors[] = { &hf_zbee_zdp_dcf_eaela, &hf_zbee_zdp_dcf_esdla, NULL @@ -828,7 +828,7 @@ static const value_string zbee_zdp_power_level_vals[] = { void zdp_parse_power_desc(proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset) { - static const int * power_desc[] = { + static int * const power_desc[] = { &hf_zbee_zdp_power_mode, &hf_zbee_zdp_power_avail_ac, &hf_zbee_zdp_power_avail_recharge, diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index ea26e0e632..df5a2b9522 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -1108,7 +1108,7 @@ zebra_route_ifindex(proto_tree *tree, tvbuff_t *tvb, int offset, guint16 len) static int zebra_route_message(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 version) { - static const int * flags[] = { + static int * const flags[] = { &hf_zebra_msg_nexthop, &hf_zebra_msg_index, &hf_zebra_msg_distance, @@ -1117,7 +1117,7 @@ zebra_route_message(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 version) &hf_zebra_msg_tag, NULL }; - static const int * flags4[] = { + static int * const flags4[] = { &hf_zebra_msg_nexthop, &hf_zebra_msg_index, &hf_zebra_msg_distance, @@ -1127,7 +1127,7 @@ zebra_route_message(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 version) &hf_zebra_msg4_srcpfx, NULL }; - static const int * flags5[] = { + static int * const flags5[] = { &hf_zebra_msg_nexthop, &hf_zebra_msg5_distance, &hf_zebra_msg5_metric, diff --git a/epan/dissectors/pidl/lsa/lsa.cnf b/epan/dissectors/pidl/lsa/lsa.cnf index 738476d4fb..4453f7fe8a 100644 --- a/epan/dissectors/pidl/lsa/lsa.cnf +++ b/epan/dissectors/pidl/lsa/lsa.cnf @@ -65,7 +65,7 @@ CODE START static void lsarpc_policy_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION, &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_LOOKUP_NAMES, &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SERVER_ADMIN, @@ -88,7 +88,7 @@ lsarpc_policy_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin static void lsarpc_account_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS, &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS, &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES, @@ -102,7 +102,7 @@ lsarpc_account_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, gui static void lsarpc_secret_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE, &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE, NULL @@ -114,7 +114,7 @@ lsarpc_secret_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guin static void lsarpc_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_AUTH, &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_AUTH, &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_POSIX, diff --git a/epan/dissectors/pidl/samr/samr.cnf b/epan/dissectors/pidl/samr/samr.cnf index 5ccb2f9b0c..07ca73de5f 100644 --- a/epan/dissectors/pidl/samr/samr.cnf +++ b/epan/dissectors/pidl/samr/samr.cnf @@ -211,7 +211,7 @@ CODE START static void samr_connect_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_LOOKUP_DOMAIN, &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_ENUM_DOMAINS, &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CREATE_DOMAIN, @@ -244,7 +244,7 @@ samr_dissect_bitmap_ConnectAccessMask(tvbuff_t *tvb, int offset, packet_info *pi static void samr_alias_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER, &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER, &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS, @@ -276,7 +276,7 @@ samr_dissect_bitmap_AliasAccessMask(tvbuff_t *tvb, int offset, packet_info *pinf static void samr_group_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS, &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER, &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER, @@ -308,7 +308,7 @@ samr_dissect_bitmap_GroupAccessMask(tvbuff_t *tvb, int offset, packet_info *pinf static void samr_domain_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1, &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1, &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2, @@ -346,7 +346,7 @@ samr_dissect_bitmap_DomainAccessMask(tvbuff_t *tvb, int offset, packet_info *pin static void samr_user_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP, &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP, &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUPS, diff --git a/epan/dissectors/pidl/winreg/winreg.cnf b/epan/dissectors/pidl/winreg/winreg.cnf index 9afe7e6f15..1a0fa39667 100644 --- a/epan/dissectors/pidl/winreg/winreg.cnf +++ b/epan/dissectors/pidl/winreg/winreg.cnf @@ -138,7 +138,7 @@ CODE START static void winreg_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access) { - static const int* access_flags[] = { + static int* const access_flags[] = { &hf_winreg_winreg_AccessMask_KEY_WOW64_32KEY, &hf_winreg_winreg_AccessMask_KEY_WOW64_64KEY, &hf_winreg_winreg_AccessMask_KEY_CREATE_LINK, diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h index 1d980c9fa1..fc00d60907 100644 --- a/epan/dissectors/x11-extension-implementation.h +++ b/epan/dissectors/x11-extension-implementation.h @@ -10035,7 +10035,7 @@ static void struct_randr_ModeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_name_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* mode_flags_bits [] = { + int* const mode_flags_bits [] = { &hf_x11_struct_randr_ModeInfo_mode_flags_mask_HsyncPositive, &hf_x11_struct_randr_ModeInfo_mode_flags_mask_HsyncNegative, &hf_x11_struct_randr_ModeInfo_mode_flags_mask_VsyncPositive, @@ -10076,7 +10076,7 @@ static void struct_randr_CrtcChange(tvbuff_t *tvb, int *offsetp, proto_tree *roo proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_mode, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* rotation_bits [] = { + int* const rotation_bits [] = { &hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_0, &hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_90, &hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_180, @@ -10123,7 +10123,7 @@ static void struct_randr_OutputChange(tvbuff_t *tvb, int *offsetp, proto_tree *r proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_mode, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* rotation_bits [] = { + int* const rotation_bits [] = { &hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_0, &hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_90, &hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_180, @@ -10474,7 +10474,7 @@ static void presentSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse proto_tree_add_item(t, hf_x11_present_SelectInput_window, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* event_mask_bits [] = { + int* const event_mask_bits [] = { &hf_x11_present_SelectInput_event_mask_mask_ConfigureNotify, &hf_x11_present_SelectInput_event_mask_mask_CompleteNotify, &hf_x11_present_SelectInput_event_mask_mask_IdleNotify, @@ -10695,7 +10695,7 @@ static void randrSetScreenConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *off proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_sizeID, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* rotation_bits [] = { + int* const rotation_bits [] = { &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_0, &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_90, &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_180, @@ -10742,7 +10742,7 @@ static void randrSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp proto_tree_add_item(t, hf_x11_randr_SelectInput_window, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* enable_bits [] = { + int* const enable_bits [] = { &hf_x11_randr_SelectInput_enable_mask_ScreenChange, &hf_x11_randr_SelectInput_enable_mask_CrtcChange, &hf_x11_randr_SelectInput_enable_mask_OutputChange, @@ -10775,7 +10775,7 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off REPLY(reply); { - const int* rotations_bits [] = { + int* const rotations_bits [] = { &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_0, &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_90, &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_180, @@ -10805,7 +10805,7 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_sizeID, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* rotation_bits [] = { + int* const rotation_bits [] = { &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_0, &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_90, &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_180, @@ -11220,7 +11220,7 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_mode, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* rotation_bits [] = { + int* const rotation_bits [] = { &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_0, &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_90, &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_180, @@ -11233,7 +11233,7 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse } *offsetp += 2; { - const int* rotations_bits [] = { + int* const rotations_bits [] = { &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_0, &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_90, &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_180, @@ -11270,7 +11270,7 @@ static void randrSetCrtcConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_mode, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* rotation_bits [] = { + int* const rotation_bits [] = { &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_0, &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_90, &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_180, @@ -11696,7 +11696,7 @@ static void randrGetProviderInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_timestamp, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* capabilities_bits [] = { + int* const capabilities_bits [] = { &hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SourceOutput, &hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SinkOutput, &hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SourceOffload, @@ -12716,7 +12716,7 @@ static void renderCreatePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs *offsetp += 4; f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* value_mask_bits [] = { + int* const value_mask_bits [] = { &hf_x11_render_CreatePicture_value_mask_mask_Repeat, &hf_x11_render_CreatePicture_value_mask_mask_AlphaMap, &hf_x11_render_CreatePicture_value_mask_mask_AlphaXOrigin, @@ -12792,7 +12792,7 @@ static void renderChangePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs *offsetp += 4; f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* value_mask_bits [] = { + int* const value_mask_bits [] = { &hf_x11_render_ChangePicture_value_mask_mask_Repeat, &hf_x11_render_ChangePicture_value_mask_mask_AlphaMap, &hf_x11_render_ChangePicture_value_mask_mask_AlphaXOrigin, @@ -13445,7 +13445,7 @@ static void struct_res_ClientIdSpec(tvbuff_t *tvb, int *offsetp, proto_tree *roo proto_tree_add_item(t, hf_x11_struct_res_ClientIdSpec_client, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_struct_res_ClientIdSpec_mask_mask_ClientXID, &hf_x11_struct_res_ClientIdSpec_mask_mask_LocalClientPID, NULL @@ -13852,7 +13852,7 @@ static void screensaverSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *o proto_tree_add_item(t, hf_x11_screensaver_SelectInput_drawable, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* event_mask_bits [] = { + int* const event_mask_bits [] = { &hf_x11_screensaver_SelectInput_event_mask_mask_NotifyMask, &hf_x11_screensaver_SelectInput_event_mask_mask_CycleMask, NULL @@ -13884,7 +13884,7 @@ static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp += 4; f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* value_mask_bits [] = { + int* const value_mask_bits [] = { &hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixmap, &hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixel, &hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixmap, @@ -13946,7 +13946,7 @@ static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int } if (f_value_mask & (1U << 11)) { { - const int* event_mask_bits [] = { + int* const event_mask_bits [] = { &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyPress, &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyRelease, &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonPress, @@ -13980,7 +13980,7 @@ static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int } if (f_value_mask & (1U << 12)) { { - const int* do_not_propogate_mask_bits [] = { + int* const do_not_propogate_mask_bits [] = { &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyPress, &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyRelease, &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonPress, @@ -14721,7 +14721,7 @@ static void syncCreateAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 4; f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* value_mask_bits [] = { + int* const value_mask_bits [] = { &hf_x11_sync_CreateAlarm_value_mask_mask_Counter, &hf_x11_sync_CreateAlarm_value_mask_mask_ValueType, &hf_x11_sync_CreateAlarm_value_mask_mask_Value, @@ -14762,7 +14762,7 @@ static void syncChangeAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 4; f_value_mask = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* value_mask_bits [] = { + int* const value_mask_bits [] = { &hf_x11_sync_ChangeAlarm_value_mask_mask_Counter, &hf_x11_sync_ChangeAlarm_value_mask_mask_ValueType, &hf_x11_sync_ChangeAlarm_value_mask_mask_Value, @@ -15822,7 +15822,7 @@ static void struct_xf86vidmode_ModeInfo(tvbuff_t *tvb, int *offsetp, proto_tree proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 4, ENC_NA); *offsetp += 4; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Positive_HSync, &hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Negative_HSync, &hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Positive_VSync, @@ -15918,7 +15918,7 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_VSync, @@ -15971,7 +15971,7 @@ static void xf86vidmodeModModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_VSync, @@ -16121,7 +16121,7 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_VSync, @@ -16168,7 +16168,7 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* after_flags_bits [] = { + int* const after_flags_bits [] = { &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_VSync, @@ -16221,7 +16221,7 @@ static void xf86vidmodeDeleteModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_VSync, @@ -16277,7 +16277,7 @@ static void xf86vidmodeValidateModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, i proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_VSync, @@ -16353,7 +16353,7 @@ static void xf86vidmodeSwitchToMode(tvbuff_t *tvb, packet_info *pinfo _U_, int * proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_HSync, &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_HSync, &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_VSync, @@ -16449,7 +16449,7 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp += 4; f_flags = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable, NULL }; @@ -16622,7 +16622,7 @@ static void xf86vidmodeGetPermissions_Reply(tvbuff_t *tvb, packet_info *pinfo, i proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* permissions_bits [] = { + int* const permissions_bits [] = { &hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Read, &hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Write, NULL @@ -16806,7 +16806,7 @@ static void xfixesSelectSelectionInput(tvbuff_t *tvb, packet_info *pinfo _U_, in proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_selection, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* event_mask_bits [] = { + int* const event_mask_bits [] = { &hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SetSelectionOwner, &hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionWindowDestroy, &hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionClientClose, @@ -16838,7 +16838,7 @@ static void xfixesSelectCursorInput(tvbuff_t *tvb, packet_info *pinfo _U_, int * proto_tree_add_item(t, hf_x11_xfixes_SelectCursorInput_window, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* event_mask_bits [] = { + int* const event_mask_bits [] = { &hf_x11_xfixes_SelectCursorInput_event_mask_mask_DisplayCursor, NULL }; @@ -17229,7 +17229,7 @@ static void xfixesCreatePointerBarrier(tvbuff_t *tvb, packet_info *pinfo _U_, in proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_y2, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* directions_bits [] = { + int* const directions_bits [] = { &hf_x11_xfixes_CreatePointerBarrier_directions_mask_PositiveX, &hf_x11_xfixes_CreatePointerBarrier_directions_mask_PositiveY, &hf_x11_xfixes_CreatePointerBarrier_directions_mask_NegativeX, @@ -18183,7 +18183,7 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_num_classes, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* modifiers_bits [] = { + int* const modifiers_bits [] = { &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Shift, &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Lock, &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Control, @@ -18217,7 +18217,7 @@ static void xinputUngrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *of proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_grabWindow, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* modifiers_bits [] = { + int* const modifiers_bits [] = { &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Shift, &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Lock, &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Control, @@ -18250,7 +18250,7 @@ static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *o proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_num_classes, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* modifiers_bits [] = { + int* const modifiers_bits [] = { &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Shift, &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Lock, &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Control, @@ -18281,7 +18281,7 @@ static void xinputUngrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_grab_window, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* modifiers_bits [] = { + int* const modifiers_bits [] = { &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Shift, &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Lock, &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Control, @@ -18556,7 +18556,7 @@ static void struct_xinput_FeedbackCtl(tvbuff_t *tvb, int *offsetp, proto_tree *r static void xinputChangeFeedbackControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelNum, &hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelDenom, &hf_x11_xinput_ChangeFeedbackControl_mask_mask_Threshold, @@ -18803,7 +18803,7 @@ static void struct_xinput_InputState(tvbuff_t *tvb, int *offsetp, proto_tree *ro proto_tree_add_item(t, hf_x11_struct_xinput_InputState_Valuator_num_valuators, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mode_bits [] = { + int* const mode_bits [] = { &hf_x11_struct_xinput_InputState_Valuator_mode_mask_DeviceModeAbsolute, &hf_x11_struct_xinput_InputState_Valuator_mode_mask_OutOfProximity, NULL @@ -19607,7 +19607,7 @@ static void struct_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, proto_tree *r proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_NoEmulation, &hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_Preferred, NULL @@ -20109,7 +20109,7 @@ static void xinputDeviceKeyPress(tvbuff_t *tvb, int *offsetp, proto_tree *t, gui proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_event_y, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* state_bits [] = { + int* const state_bits [] = { &hf_x11_xinput_DeviceKeyPress_state_mask_Shift, &hf_x11_xinput_DeviceKeyPress_state_mask_Lock, &hf_x11_xinput_DeviceKeyPress_state_mask_Control, @@ -20165,7 +20165,7 @@ static void xinputDeviceStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_num_valuators, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* classes_reported_bits [] = { + int* const classes_reported_bits [] = { &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingKeys, &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingButtons, &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingValuators, @@ -20317,7 +20317,7 @@ static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_KeyPress_flags_mask_KeyRepeat, NULL }; @@ -20373,7 +20373,7 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_ButtonPress_flags_mask_PointerEmulated, NULL }; @@ -20448,7 +20448,7 @@ static void struct_xinput_HierarchyInfo(tvbuff_t *tvb, int *offsetp, proto_tree proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xinput_HierarchyInfo_flags_mask_MasterAdded, &hf_x11_struct_xinput_HierarchyInfo_flags_mask_MasterRemoved, &hf_x11_struct_xinput_HierarchyInfo_flags_mask_SlaveAdded, @@ -20473,7 +20473,7 @@ static void xinputHierarchy(tvbuff_t *tvb, int length _U_, int *offsetp, proto_t field16(tvb, offsetp, t, hf_x11_xinput_Hierarchy_deviceid, byte_order); field32(tvb, offsetp, t, hf_x11_xinput_Hierarchy_time, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_Hierarchy_flags_mask_MasterAdded, &hf_x11_xinput_Hierarchy_flags_mask_MasterRemoved, &hf_x11_xinput_Hierarchy_flags_mask_SlaveAdded, @@ -20526,7 +20526,7 @@ static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_valuators_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_RawKeyPress_flags_mask_KeyRepeat, NULL }; @@ -20563,7 +20563,7 @@ static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, pr proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_valuators_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_RawButtonPress_flags_mask_PointerEmulated, NULL }; @@ -20619,7 +20619,7 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_ proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_TouchBegin_flags_mask_TouchPendingEnd, &hf_x11_xinput_TouchBegin_flags_mask_TouchEmulatingPointer, NULL @@ -20680,7 +20680,7 @@ static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, pro proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_valuators_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_RawTouchBegin_flags_mask_TouchPendingEnd, &hf_x11_xinput_RawTouchBegin_flags_mask_TouchEmulatingPointer, NULL @@ -20719,7 +20719,7 @@ static void xinputBarrierHit(tvbuff_t *tvb, int length _U_, int *offsetp, proto_ proto_tree_add_item(t, hf_x11_xinput_BarrierHit_dtime, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xinput_BarrierHit_flags_mask_PointerReleased, &hf_x11_xinput_BarrierHit_flags_mask_DeviceIsGrabbed, NULL @@ -21107,7 +21107,7 @@ static void struct_xkb_IndicatorMap(tvbuff_t *tvb, int *offsetp, proto_tree *roo field8(tvb, offsetp, t, hf_x11_struct_xkb_IndicatorMap_groups, byte_order); field8(tvb, offsetp, t, hf_x11_struct_xkb_IndicatorMap_whichMods, byte_order); { - const int* mods_bits [] = { + int* const mods_bits [] = { &hf_x11_struct_xkb_IndicatorMap_mods_mask_Shift, &hf_x11_struct_xkb_IndicatorMap_mods_mask_Lock, &hf_x11_struct_xkb_IndicatorMap_mods_mask_Control, @@ -21123,7 +21123,7 @@ static void struct_xkb_IndicatorMap(tvbuff_t *tvb, int *offsetp, proto_tree *roo } *offsetp += 1; { - const int* realMods_bits [] = { + int* const realMods_bits [] = { &hf_x11_struct_xkb_IndicatorMap_realMods_mask_Shift, &hf_x11_struct_xkb_IndicatorMap_realMods_mask_Lock, &hf_x11_struct_xkb_IndicatorMap_realMods_mask_Control, @@ -21139,7 +21139,7 @@ static void struct_xkb_IndicatorMap(tvbuff_t *tvb, int *offsetp, proto_tree *roo } *offsetp += 1; { - const int* vmods_bits [] = { + int* const vmods_bits [] = { &hf_x11_struct_xkb_IndicatorMap_vmods_mask_0, &hf_x11_struct_xkb_IndicatorMap_vmods_mask_1, &hf_x11_struct_xkb_IndicatorMap_vmods_mask_2, @@ -21162,7 +21162,7 @@ static void struct_xkb_IndicatorMap(tvbuff_t *tvb, int *offsetp, proto_tree *roo } *offsetp += 2; { - const int* ctrls_bits [] = { + int* const ctrls_bits [] = { &hf_x11_struct_xkb_IndicatorMap_ctrls_mask_RepeatKeys, &hf_x11_struct_xkb_IndicatorMap_ctrls_mask_SlowKeys, &hf_x11_struct_xkb_IndicatorMap_ctrls_mask_BounceKeys, @@ -21194,7 +21194,7 @@ static void struct_xkb_ModDef(tvbuff_t *tvb, int *offsetp, proto_tree *root, gui item = proto_tree_add_item(root, hf_x11_struct_xkb_ModDef, tvb, *offsetp, 4, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_struct_xkb_ModDef_mask_mask_Shift, &hf_x11_struct_xkb_ModDef_mask_mask_Lock, &hf_x11_struct_xkb_ModDef_mask_mask_Control, @@ -21210,7 +21210,7 @@ static void struct_xkb_ModDef(tvbuff_t *tvb, int *offsetp, proto_tree *root, gui } *offsetp += 1; { - const int* realMods_bits [] = { + int* const realMods_bits [] = { &hf_x11_struct_xkb_ModDef_realMods_mask_Shift, &hf_x11_struct_xkb_ModDef_realMods_mask_Lock, &hf_x11_struct_xkb_ModDef_realMods_mask_Control, @@ -21226,7 +21226,7 @@ static void struct_xkb_ModDef(tvbuff_t *tvb, int *offsetp, proto_tree *root, gui } *offsetp += 1; { - const int* vmods_bits [] = { + int* const vmods_bits [] = { &hf_x11_struct_xkb_ModDef_vmods_mask_0, &hf_x11_struct_xkb_ModDef_vmods_mask_1, &hf_x11_struct_xkb_ModDef_vmods_mask_2, @@ -21318,7 +21318,7 @@ static void struct_xkb_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_active, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mods_mask_bits [] = { + int* const mods_mask_bits [] = { &hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Shift, &hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Lock, &hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Control, @@ -21336,7 +21336,7 @@ static void struct_xkb_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_level, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mods_mods_bits [] = { + int* const mods_mods_bits [] = { &hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Shift, &hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Lock, &hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Control, @@ -21352,7 +21352,7 @@ static void struct_xkb_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* mods_vmods_bits [] = { + int* const mods_vmods_bits [] = { &hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_0, &hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_1, &hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_2, @@ -21403,7 +21403,7 @@ static void struct_xkb_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyType, tvb, *offsetp, struct_size_xkb_KeyType(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); { - const int* mods_mask_bits [] = { + int* const mods_mask_bits [] = { &hf_x11_struct_xkb_KeyType_mods_mask_mask_Shift, &hf_x11_struct_xkb_KeyType_mods_mask_mask_Lock, &hf_x11_struct_xkb_KeyType_mods_mask_mask_Control, @@ -21419,7 +21419,7 @@ static void struct_xkb_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu } *offsetp += 1; { - const int* mods_mods_bits [] = { + int* const mods_mods_bits [] = { &hf_x11_struct_xkb_KeyType_mods_mods_mask_Shift, &hf_x11_struct_xkb_KeyType_mods_mods_mask_Lock, &hf_x11_struct_xkb_KeyType_mods_mods_mask_Control, @@ -21435,7 +21435,7 @@ static void struct_xkb_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu } *offsetp += 1; { - const int* mods_vmods_bits [] = { + int* const mods_vmods_bits [] = { &hf_x11_struct_xkb_KeyType_mods_vmods_mask_0, &hf_x11_struct_xkb_KeyType_mods_vmods_mask_1, &hf_x11_struct_xkb_KeyType_mods_vmods_mask_2, @@ -21634,7 +21634,7 @@ static void struct_xkb_SetExplicit(tvbuff_t *tvb, int *offsetp, proto_tree *root proto_tree_add_item(t, hf_x11_struct_xkb_SetExplicit_keycode, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* explicit_bits [] = { + int* const explicit_bits [] = { &hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType1, &hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType2, &hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType3, @@ -21663,7 +21663,7 @@ static void struct_xkb_KeyModMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_struct_xkb_KeyModMap_keycode, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mods_bits [] = { + int* const mods_bits [] = { &hf_x11_struct_xkb_KeyModMap_mods_mask_Shift, &hf_x11_struct_xkb_KeyModMap_mods_mask_Lock, &hf_x11_struct_xkb_KeyModMap_mods_mask_Control, @@ -21695,7 +21695,7 @@ static void struct_xkb_KeyVModMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; { - const int* vmods_bits [] = { + int* const vmods_bits [] = { &hf_x11_struct_xkb_KeyVModMap_vmods_mask_0, &hf_x11_struct_xkb_KeyVModMap_vmods_mask_1, &hf_x11_struct_xkb_KeyVModMap_vmods_mask_2, @@ -21732,7 +21732,7 @@ static void struct_xkb_KTSetMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *ro proto_tree_add_item(t, hf_x11_struct_xkb_KTSetMapEntry_level, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* realMods_bits [] = { + int* const realMods_bits [] = { &hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Shift, &hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Lock, &hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Control, @@ -21748,7 +21748,7 @@ static void struct_xkb_KTSetMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_0, &hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_1, &hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_2, @@ -21797,7 +21797,7 @@ static void struct_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, item = proto_tree_add_item(root, hf_x11_struct_xkb_SetKeyType, tvb, *offsetp, struct_size_xkb_SetKeyType(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_struct_xkb_SetKeyType_mask_mask_Shift, &hf_x11_struct_xkb_SetKeyType_mask_mask_Lock, &hf_x11_struct_xkb_SetKeyType_mask_mask_Control, @@ -21813,7 +21813,7 @@ static void struct_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* realMods_bits [] = { + int* const realMods_bits [] = { &hf_x11_struct_xkb_SetKeyType_realMods_mask_Shift, &hf_x11_struct_xkb_SetKeyType_realMods_mask_Lock, &hf_x11_struct_xkb_SetKeyType_realMods_mask_Control, @@ -21829,7 +21829,7 @@ static void struct_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_struct_xkb_SetKeyType_virtualMods_mask_0, &hf_x11_struct_xkb_SetKeyType_virtualMods_mask_1, &hf_x11_struct_xkb_SetKeyType_virtualMods_mask_2, @@ -21965,7 +21965,7 @@ static void struct_xkb_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetMods_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SASetMods_flags_mask_ClearLocks, &hf_x11_struct_xkb_SASetMods_flags_mask_LatchToLock, &hf_x11_struct_xkb_SASetMods_flags_mask_GroupAbsolute, @@ -21975,7 +21975,7 @@ static void struct_xkb_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_struct_xkb_SASetMods_mask_mask_Shift, &hf_x11_struct_xkb_SASetMods_mask_mask_Lock, &hf_x11_struct_xkb_SASetMods_mask_mask_Control, @@ -21991,7 +21991,7 @@ static void struct_xkb_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* realMods_bits [] = { + int* const realMods_bits [] = { &hf_x11_struct_xkb_SASetMods_realMods_mask_Shift, &hf_x11_struct_xkb_SASetMods_realMods_mask_Lock, &hf_x11_struct_xkb_SASetMods_realMods_mask_Control, @@ -22007,7 +22007,7 @@ static void struct_xkb_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* vmodsHigh_bits [] = { + int* const vmodsHigh_bits [] = { &hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_8, &hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_9, &hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_10, @@ -22022,7 +22022,7 @@ static void struct_xkb_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* vmodsLow_bits [] = { + int* const vmodsLow_bits [] = { &hf_x11_struct_xkb_SASetMods_vmodsLow_mask_0, &hf_x11_struct_xkb_SASetMods_vmodsLow_mask_1, &hf_x11_struct_xkb_SASetMods_vmodsLow_mask_2, @@ -22052,7 +22052,7 @@ static void struct_xkb_SASetGroup(tvbuff_t *tvb, int *offsetp, proto_tree *root, t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetGroup_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SASetGroup_flags_mask_ClearLocks, &hf_x11_struct_xkb_SASetGroup_flags_mask_LatchToLock, &hf_x11_struct_xkb_SASetGroup_flags_mask_GroupAbsolute, @@ -22079,7 +22079,7 @@ static void struct_xkb_SAMovePtr(tvbuff_t *tvb, int *offsetp, proto_tree *root, t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SAMovePtr_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SAMovePtr_flags_mask_NoAcceleration, &hf_x11_struct_xkb_SAMovePtr_flags_mask_MoveAbsoluteX, &hf_x11_struct_xkb_SAMovePtr_flags_mask_MoveAbsoluteY, @@ -22154,7 +22154,7 @@ static void struct_xkb_SASetPtrDflt(tvbuff_t *tvb, int *offsetp, proto_tree *roo t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetPtrDflt_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SASetPtrDflt_flags_mask_AffectDfltButton, &hf_x11_struct_xkb_SASetPtrDflt_flags_mask_DfltBtnAbsolute, NULL @@ -22163,7 +22163,7 @@ static void struct_xkb_SASetPtrDflt(tvbuff_t *tvb, int *offsetp, proto_tree *roo } *offsetp += 1; { - const int* affect_bits [] = { + int* const affect_bits [] = { &hf_x11_struct_xkb_SASetPtrDflt_affect_mask_AffectDfltButton, &hf_x11_struct_xkb_SASetPtrDflt_affect_mask_DfltBtnAbsolute, NULL @@ -22189,7 +22189,7 @@ static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SAIsoLock_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SAIsoLock_flags_mask_NoLock, &hf_x11_struct_xkb_SAIsoLock_flags_mask_NoUnlock, &hf_x11_struct_xkb_SAIsoLock_flags_mask_GroupAbsolute, @@ -22200,7 +22200,7 @@ static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_struct_xkb_SAIsoLock_mask_mask_Shift, &hf_x11_struct_xkb_SAIsoLock_mask_mask_Lock, &hf_x11_struct_xkb_SAIsoLock_mask_mask_Control, @@ -22216,7 +22216,7 @@ static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* realMods_bits [] = { + int* const realMods_bits [] = { &hf_x11_struct_xkb_SAIsoLock_realMods_mask_Shift, &hf_x11_struct_xkb_SAIsoLock_realMods_mask_Lock, &hf_x11_struct_xkb_SAIsoLock_realMods_mask_Control, @@ -22234,7 +22234,7 @@ static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_group, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* affect_bits [] = { + int* const affect_bits [] = { &hf_x11_struct_xkb_SAIsoLock_affect_mask_Ctrls, &hf_x11_struct_xkb_SAIsoLock_affect_mask_Ptr, &hf_x11_struct_xkb_SAIsoLock_affect_mask_Group, @@ -22245,7 +22245,7 @@ static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* vmodsHigh_bits [] = { + int* const vmodsHigh_bits [] = { &hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_8, &hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_9, &hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_10, @@ -22260,7 +22260,7 @@ static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, } *offsetp += 1; { - const int* vmodsLow_bits [] = { + int* const vmodsLow_bits [] = { &hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_0, &hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_1, &hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_2, @@ -22324,7 +22324,7 @@ static void struct_xkb_SASetControls(tvbuff_t *tvb, int *offsetp, proto_tree *ro proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 3, ENC_NA); *offsetp += 3; { - const int* boolCtrlsHigh_bits [] = { + int* const boolCtrlsHigh_bits [] = { &hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_AccessXFeedback, &hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_AudibleBell, &hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_Overlay1, @@ -22336,7 +22336,7 @@ static void struct_xkb_SASetControls(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* boolCtrlsLow_bits [] = { + int* const boolCtrlsLow_bits [] = { &hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_RepeatKeys, &hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_SlowKeys, &hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_BounceKeys, @@ -22366,7 +22366,7 @@ static void struct_xkb_SAActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree * t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SAActionMessage_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SAActionMessage_flags_mask_OnPress, &hf_x11_struct_xkb_SAActionMessage_flags_mask_OnRelease, &hf_x11_struct_xkb_SAActionMessage_flags_mask_GenKeyEvent, @@ -22392,7 +22392,7 @@ static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *ro proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_newkey, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mask_bits [] = { + int* const mask_bits [] = { &hf_x11_struct_xkb_SARedirectKey_mask_mask_Shift, &hf_x11_struct_xkb_SARedirectKey_mask_mask_Lock, &hf_x11_struct_xkb_SARedirectKey_mask_mask_Control, @@ -22408,7 +22408,7 @@ static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* realModifiers_bits [] = { + int* const realModifiers_bits [] = { &hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Shift, &hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Lock, &hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Control, @@ -22424,7 +22424,7 @@ static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* vmodsMaskHigh_bits [] = { + int* const vmodsMaskHigh_bits [] = { &hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_8, &hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_9, &hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_10, @@ -22439,7 +22439,7 @@ static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* vmodsMaskLow_bits [] = { + int* const vmodsMaskLow_bits [] = { &hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_0, &hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_1, &hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_2, @@ -22454,7 +22454,7 @@ static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* vmodsHigh_bits [] = { + int* const vmodsHigh_bits [] = { &hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_8, &hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_9, &hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_10, @@ -22469,7 +22469,7 @@ static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *ro } *offsetp += 1; { - const int* vmodsLow_bits [] = { + int* const vmodsLow_bits [] = { &hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_0, &hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_1, &hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_2, @@ -22520,7 +22520,7 @@ static void struct_xkb_SALockDeviceBtn(tvbuff_t *tvb, int *offsetp, proto_tree * t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SALockDeviceBtn_type, byte_order); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xkb_SALockDeviceBtn_flags_mask_NoLock, &hf_x11_struct_xkb_SALockDeviceBtn_flags_mask_NoUnlock, NULL @@ -22590,7 +22590,7 @@ static void struct_xkb_SymInterpret(tvbuff_t *tvb, int *offsetp, proto_tree *roo proto_tree_add_item(t, hf_x11_struct_xkb_SymInterpret_sym, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* mods_bits [] = { + int* const mods_bits [] = { &hf_x11_struct_xkb_SymInterpret_mods_mask_Shift, &hf_x11_struct_xkb_SymInterpret_mods_mask_Lock, &hf_x11_struct_xkb_SymInterpret_mods_mask_Control, @@ -22607,7 +22607,7 @@ static void struct_xkb_SymInterpret(tvbuff_t *tvb, int *offsetp, proto_tree *roo *offsetp += 1; field8(tvb, offsetp, t, hf_x11_struct_xkb_SymInterpret_match, byte_order); { - const int* virtualMod_bits [] = { + int* const virtualMod_bits [] = { &hf_x11_struct_xkb_SymInterpret_virtualMod_mask_0, &hf_x11_struct_xkb_SymInterpret_virtualMod_mask_1, &hf_x11_struct_xkb_SymInterpret_virtualMod_mask_2, @@ -22725,7 +22725,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 2; f_affectWhich = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* affectWhich_bits [] = { + int* const affectWhich_bits [] = { &hf_x11_xkb_SelectEvents_affectWhich_mask_NewKeyboardNotify, &hf_x11_xkb_SelectEvents_affectWhich_mask_MapNotify, &hf_x11_xkb_SelectEvents_affectWhich_mask_StateNotify, @@ -22745,7 +22745,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 2; f_clear = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* clear_bits [] = { + int* const clear_bits [] = { &hf_x11_xkb_SelectEvents_clear_mask_NewKeyboardNotify, &hf_x11_xkb_SelectEvents_clear_mask_MapNotify, &hf_x11_xkb_SelectEvents_clear_mask_StateNotify, @@ -22765,7 +22765,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 2; f_selectAll = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* selectAll_bits [] = { + int* const selectAll_bits [] = { &hf_x11_xkb_SelectEvents_selectAll_mask_NewKeyboardNotify, &hf_x11_xkb_SelectEvents_selectAll_mask_MapNotify, &hf_x11_xkb_SelectEvents_selectAll_mask_StateNotify, @@ -22784,7 +22784,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* affectMap_bits [] = { + int* const affectMap_bits [] = { &hf_x11_xkb_SelectEvents_affectMap_mask_KeyTypes, &hf_x11_xkb_SelectEvents_affectMap_mask_KeySyms, &hf_x11_xkb_SelectEvents_affectMap_mask_ModifierMap, @@ -22799,7 +22799,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* map_bits [] = { + int* const map_bits [] = { &hf_x11_xkb_SelectEvents_map_mask_KeyTypes, &hf_x11_xkb_SelectEvents_map_mask_KeySyms, &hf_x11_xkb_SelectEvents_map_mask_ModifierMap, @@ -22815,7 +22815,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 2; if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 0)) { { - const int* affectNewKeyboard_bits [] = { + int* const affectNewKeyboard_bits [] = { &hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_Keycodes, &hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_Geometry, &hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_DeviceID, @@ -22825,7 +22825,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* newKeyboardDetails_bits [] = { + int* const newKeyboardDetails_bits [] = { &hf_x11_xkb_SelectEvents_NewKeyboardNotify_newKeyboardDetails_mask_Keycodes, &hf_x11_xkb_SelectEvents_NewKeyboardNotify_newKeyboardDetails_mask_Geometry, &hf_x11_xkb_SelectEvents_NewKeyboardNotify_newKeyboardDetails_mask_DeviceID, @@ -22837,7 +22837,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 2)) { { - const int* affectState_bits [] = { + int* const affectState_bits [] = { &hf_x11_xkb_SelectEvents_StateNotify_affectState_mask_ModifierState, &hf_x11_xkb_SelectEvents_StateNotify_affectState_mask_ModifierBase, &hf_x11_xkb_SelectEvents_StateNotify_affectState_mask_ModifierLatch, @@ -22858,7 +22858,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* stateDetails_bits [] = { + int* const stateDetails_bits [] = { &hf_x11_xkb_SelectEvents_StateNotify_stateDetails_mask_ModifierState, &hf_x11_xkb_SelectEvents_StateNotify_stateDetails_mask_ModifierBase, &hf_x11_xkb_SelectEvents_StateNotify_stateDetails_mask_ModifierLatch, @@ -22881,7 +22881,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 3)) { { - const int* affectCtrls_bits [] = { + int* const affectCtrls_bits [] = { &hf_x11_xkb_SelectEvents_ControlsNotify_affectCtrls_mask_GroupsWrap, &hf_x11_xkb_SelectEvents_ControlsNotify_affectCtrls_mask_InternalMods, &hf_x11_xkb_SelectEvents_ControlsNotify_affectCtrls_mask_IgnoreLockMods, @@ -22893,7 +22893,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 4; { - const int* ctrlDetails_bits [] = { + int* const ctrlDetails_bits [] = { &hf_x11_xkb_SelectEvents_ControlsNotify_ctrlDetails_mask_GroupsWrap, &hf_x11_xkb_SelectEvents_ControlsNotify_ctrlDetails_mask_InternalMods, &hf_x11_xkb_SelectEvents_ControlsNotify_ctrlDetails_mask_IgnoreLockMods, @@ -22919,7 +22919,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 6)) { { - const int* affectNames_bits [] = { + int* const affectNames_bits [] = { &hf_x11_xkb_SelectEvents_NamesNotify_affectNames_mask_Keycodes, &hf_x11_xkb_SelectEvents_NamesNotify_affectNames_mask_Geometry, &hf_x11_xkb_SelectEvents_NamesNotify_affectNames_mask_Symbols, @@ -22940,7 +22940,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* namesDetails_bits [] = { + int* const namesDetails_bits [] = { &hf_x11_xkb_SelectEvents_NamesNotify_namesDetails_mask_Keycodes, &hf_x11_xkb_SelectEvents_NamesNotify_namesDetails_mask_Geometry, &hf_x11_xkb_SelectEvents_NamesNotify_namesDetails_mask_Symbols, @@ -22963,7 +22963,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 7)) { { - const int* affectCompat_bits [] = { + int* const affectCompat_bits [] = { &hf_x11_xkb_SelectEvents_CompatMapNotify_affectCompat_mask_SymInterp, &hf_x11_xkb_SelectEvents_CompatMapNotify_affectCompat_mask_GroupCompat, NULL @@ -22972,7 +22972,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 1; { - const int* compatDetails_bits [] = { + int* const compatDetails_bits [] = { &hf_x11_xkb_SelectEvents_CompatMapNotify_compatDetails_mask_SymInterp, &hf_x11_xkb_SelectEvents_CompatMapNotify_compatDetails_mask_GroupCompat, NULL @@ -22995,7 +22995,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 10)) { { - const int* affectAccessX_bits [] = { + int* const affectAccessX_bits [] = { &hf_x11_xkb_SelectEvents_AccessXNotify_affectAccessX_mask_SKPress, &hf_x11_xkb_SelectEvents_AccessXNotify_affectAccessX_mask_SKAccept, &hf_x11_xkb_SelectEvents_AccessXNotify_affectAccessX_mask_SKReject, @@ -23009,7 +23009,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* accessXDetails_bits [] = { + int* const accessXDetails_bits [] = { &hf_x11_xkb_SelectEvents_AccessXNotify_accessXDetails_mask_SKPress, &hf_x11_xkb_SelectEvents_AccessXNotify_accessXDetails_mask_SKAccept, &hf_x11_xkb_SelectEvents_AccessXNotify_accessXDetails_mask_SKReject, @@ -23025,7 +23025,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } if ((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1U << 11)) { { - const int* affectExtDev_bits [] = { + int* const affectExtDev_bits [] = { &hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_affectExtDev_mask_Keyboards, &hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_affectExtDev_mask_ButtonActions, &hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_affectExtDev_mask_IndicatorNames, @@ -23037,7 +23037,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* extdevDetails_bits [] = { + int* const extdevDetails_bits [] = { &hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_extdevDetails_mask_Keyboards, &hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_extdevDetails_mask_ButtonActions, &hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_extdevDetails_mask_IndicatorNames, @@ -23102,7 +23102,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* mods_bits [] = { + int* const mods_bits [] = { &hf_x11_xkb_GetState_reply_mods_mask_Shift, &hf_x11_xkb_GetState_reply_mods_mask_Lock, &hf_x11_xkb_GetState_reply_mods_mask_Control, @@ -23118,7 +23118,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* baseMods_bits [] = { + int* const baseMods_bits [] = { &hf_x11_xkb_GetState_reply_baseMods_mask_Shift, &hf_x11_xkb_GetState_reply_baseMods_mask_Lock, &hf_x11_xkb_GetState_reply_baseMods_mask_Control, @@ -23134,7 +23134,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* latchedMods_bits [] = { + int* const latchedMods_bits [] = { &hf_x11_xkb_GetState_reply_latchedMods_mask_Shift, &hf_x11_xkb_GetState_reply_latchedMods_mask_Lock, &hf_x11_xkb_GetState_reply_latchedMods_mask_Control, @@ -23150,7 +23150,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* lockedMods_bits [] = { + int* const lockedMods_bits [] = { &hf_x11_xkb_GetState_reply_lockedMods_mask_Shift, &hf_x11_xkb_GetState_reply_lockedMods_mask_Lock, &hf_x11_xkb_GetState_reply_lockedMods_mask_Control, @@ -23172,7 +23172,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p proto_tree_add_item(t, hf_x11_xkb_GetState_reply_latchedGroup, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* compatState_bits [] = { + int* const compatState_bits [] = { &hf_x11_xkb_GetState_reply_compatState_mask_Shift, &hf_x11_xkb_GetState_reply_compatState_mask_Lock, &hf_x11_xkb_GetState_reply_compatState_mask_Control, @@ -23188,7 +23188,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* grabMods_bits [] = { + int* const grabMods_bits [] = { &hf_x11_xkb_GetState_reply_grabMods_mask_Shift, &hf_x11_xkb_GetState_reply_grabMods_mask_Lock, &hf_x11_xkb_GetState_reply_grabMods_mask_Control, @@ -23204,7 +23204,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* compatGrabMods_bits [] = { + int* const compatGrabMods_bits [] = { &hf_x11_xkb_GetState_reply_compatGrabMods_mask_Shift, &hf_x11_xkb_GetState_reply_compatGrabMods_mask_Lock, &hf_x11_xkb_GetState_reply_compatGrabMods_mask_Control, @@ -23220,7 +23220,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* lookupMods_bits [] = { + int* const lookupMods_bits [] = { &hf_x11_xkb_GetState_reply_lookupMods_mask_Shift, &hf_x11_xkb_GetState_reply_lookupMods_mask_Lock, &hf_x11_xkb_GetState_reply_lookupMods_mask_Control, @@ -23236,7 +23236,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p } *offsetp += 1; { - const int* compatLookupMods_bits [] = { + int* const compatLookupMods_bits [] = { &hf_x11_xkb_GetState_reply_compatLookupMods_mask_Shift, &hf_x11_xkb_GetState_reply_compatLookupMods_mask_Lock, &hf_x11_xkb_GetState_reply_compatLookupMods_mask_Control, @@ -23254,7 +23254,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; { - const int* ptrBtnState_bits [] = { + int* const ptrBtnState_bits [] = { &hf_x11_xkb_GetState_reply_ptrBtnState_mask_Shift, &hf_x11_xkb_GetState_reply_ptrBtnState_mask_Lock, &hf_x11_xkb_GetState_reply_ptrBtnState_mask_Control, @@ -23282,7 +23282,7 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset proto_tree_add_item(t, hf_x11_xkb_LatchLockState_deviceSpec, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* affectModLocks_bits [] = { + int* const affectModLocks_bits [] = { &hf_x11_xkb_LatchLockState_affectModLocks_mask_Shift, &hf_x11_xkb_LatchLockState_affectModLocks_mask_Lock, &hf_x11_xkb_LatchLockState_affectModLocks_mask_Control, @@ -23298,7 +23298,7 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset } *offsetp += 1; { - const int* modLocks_bits [] = { + int* const modLocks_bits [] = { &hf_x11_xkb_LatchLockState_modLocks_mask_Shift, &hf_x11_xkb_LatchLockState_modLocks_mask_Lock, &hf_x11_xkb_LatchLockState_modLocks_mask_Control, @@ -23317,7 +23317,7 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset *offsetp += 1; field8(tvb, offsetp, t, hf_x11_xkb_LatchLockState_groupLock, byte_order); { - const int* affectModLatches_bits [] = { + int* const affectModLatches_bits [] = { &hf_x11_xkb_LatchLockState_affectModLatches_mask_Shift, &hf_x11_xkb_LatchLockState_affectModLatches_mask_Lock, &hf_x11_xkb_LatchLockState_affectModLatches_mask_Control, @@ -23371,7 +23371,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_groupsWrap, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* internalModsMask_bits [] = { + int* const internalModsMask_bits [] = { &hf_x11_xkb_GetControls_reply_internalModsMask_mask_Shift, &hf_x11_xkb_GetControls_reply_internalModsMask_mask_Lock, &hf_x11_xkb_GetControls_reply_internalModsMask_mask_Control, @@ -23387,7 +23387,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 1; { - const int* ignoreLockModsMask_bits [] = { + int* const ignoreLockModsMask_bits [] = { &hf_x11_xkb_GetControls_reply_ignoreLockModsMask_mask_Shift, &hf_x11_xkb_GetControls_reply_ignoreLockModsMask_mask_Lock, &hf_x11_xkb_GetControls_reply_ignoreLockModsMask_mask_Control, @@ -23403,7 +23403,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 1; { - const int* internalModsRealMods_bits [] = { + int* const internalModsRealMods_bits [] = { &hf_x11_xkb_GetControls_reply_internalModsRealMods_mask_Shift, &hf_x11_xkb_GetControls_reply_internalModsRealMods_mask_Lock, &hf_x11_xkb_GetControls_reply_internalModsRealMods_mask_Control, @@ -23419,7 +23419,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 1; { - const int* ignoreLockModsRealMods_bits [] = { + int* const ignoreLockModsRealMods_bits [] = { &hf_x11_xkb_GetControls_reply_ignoreLockModsRealMods_mask_Shift, &hf_x11_xkb_GetControls_reply_ignoreLockModsRealMods_mask_Lock, &hf_x11_xkb_GetControls_reply_ignoreLockModsRealMods_mask_Control, @@ -23437,7 +23437,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; { - const int* internalModsVmods_bits [] = { + int* const internalModsVmods_bits [] = { &hf_x11_xkb_GetControls_reply_internalModsVmods_mask_0, &hf_x11_xkb_GetControls_reply_internalModsVmods_mask_1, &hf_x11_xkb_GetControls_reply_internalModsVmods_mask_2, @@ -23460,7 +23460,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 2; { - const int* ignoreLockModsVmods_bits [] = { + int* const ignoreLockModsVmods_bits [] = { &hf_x11_xkb_GetControls_reply_ignoreLockModsVmods_mask_0, &hf_x11_xkb_GetControls_reply_ignoreLockModsVmods_mask_1, &hf_x11_xkb_GetControls_reply_ignoreLockModsVmods_mask_2, @@ -23501,7 +23501,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysCurve, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* accessXOption_bits [] = { + int* const accessXOption_bits [] = { &hf_x11_xkb_GetControls_reply_accessXOption_mask_SKPressFB, &hf_x11_xkb_GetControls_reply_accessXOption_mask_SKAcceptFB, &hf_x11_xkb_GetControls_reply_accessXOption_mask_FeatureFB, @@ -23522,7 +23522,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXTimeout, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* accessXTimeoutOptionsMask_bits [] = { + int* const accessXTimeoutOptionsMask_bits [] = { &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SKPressFB, &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SKAcceptFB, &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_FeatureFB, @@ -23541,7 +23541,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 2; { - const int* accessXTimeoutOptionsValues_bits [] = { + int* const accessXTimeoutOptionsValues_bits [] = { &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SKPressFB, &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SKAcceptFB, &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_FeatureFB, @@ -23562,7 +23562,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* accessXTimeoutMask_bits [] = { + int* const accessXTimeoutMask_bits [] = { &hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_RepeatKeys, &hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_SlowKeys, &hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_BounceKeys, @@ -23582,7 +23582,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 4; { - const int* accessXTimeoutValues_bits [] = { + int* const accessXTimeoutValues_bits [] = { &hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_RepeatKeys, &hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_SlowKeys, &hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_BounceKeys, @@ -23602,7 +23602,7 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp } *offsetp += 4; { - const int* enabledControls_bits [] = { + int* const enabledControls_bits [] = { &hf_x11_xkb_GetControls_reply_enabledControls_mask_RepeatKeys, &hf_x11_xkb_GetControls_reply_enabledControls_mask_SlowKeys, &hf_x11_xkb_GetControls_reply_enabledControls_mask_BounceKeys, @@ -23629,7 +23629,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree_add_item(t, hf_x11_xkb_SetControls_deviceSpec, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* affectInternalRealMods_bits [] = { + int* const affectInternalRealMods_bits [] = { &hf_x11_xkb_SetControls_affectInternalRealMods_mask_Shift, &hf_x11_xkb_SetControls_affectInternalRealMods_mask_Lock, &hf_x11_xkb_SetControls_affectInternalRealMods_mask_Control, @@ -23645,7 +23645,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 1; { - const int* internalRealMods_bits [] = { + int* const internalRealMods_bits [] = { &hf_x11_xkb_SetControls_internalRealMods_mask_Shift, &hf_x11_xkb_SetControls_internalRealMods_mask_Lock, &hf_x11_xkb_SetControls_internalRealMods_mask_Control, @@ -23661,7 +23661,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 1; { - const int* affectIgnoreLockRealMods_bits [] = { + int* const affectIgnoreLockRealMods_bits [] = { &hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Shift, &hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Lock, &hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Control, @@ -23677,7 +23677,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 1; { - const int* ignoreLockRealMods_bits [] = { + int* const ignoreLockRealMods_bits [] = { &hf_x11_xkb_SetControls_ignoreLockRealMods_mask_Shift, &hf_x11_xkb_SetControls_ignoreLockRealMods_mask_Lock, &hf_x11_xkb_SetControls_ignoreLockRealMods_mask_Control, @@ -23693,7 +23693,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 1; { - const int* affectInternalVirtualMods_bits [] = { + int* const affectInternalVirtualMods_bits [] = { &hf_x11_xkb_SetControls_affectInternalVirtualMods_mask_0, &hf_x11_xkb_SetControls_affectInternalVirtualMods_mask_1, &hf_x11_xkb_SetControls_affectInternalVirtualMods_mask_2, @@ -23716,7 +23716,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* internalVirtualMods_bits [] = { + int* const internalVirtualMods_bits [] = { &hf_x11_xkb_SetControls_internalVirtualMods_mask_0, &hf_x11_xkb_SetControls_internalVirtualMods_mask_1, &hf_x11_xkb_SetControls_internalVirtualMods_mask_2, @@ -23739,7 +23739,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* affectIgnoreLockVirtualMods_bits [] = { + int* const affectIgnoreLockVirtualMods_bits [] = { &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_0, &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_1, &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_2, @@ -23762,7 +23762,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* ignoreLockVirtualMods_bits [] = { + int* const ignoreLockVirtualMods_bits [] = { &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_0, &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_1, &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_2, @@ -23789,7 +23789,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree_add_item(t, hf_x11_xkb_SetControls_groupsWrap, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* accessXOptions_bits [] = { + int* const accessXOptions_bits [] = { &hf_x11_xkb_SetControls_accessXOptions_mask_SKPressFB, &hf_x11_xkb_SetControls_accessXOptions_mask_SKAcceptFB, &hf_x11_xkb_SetControls_accessXOptions_mask_FeatureFB, @@ -23810,7 +23810,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* affectEnabledControls_bits [] = { + int* const affectEnabledControls_bits [] = { &hf_x11_xkb_SetControls_affectEnabledControls_mask_RepeatKeys, &hf_x11_xkb_SetControls_affectEnabledControls_mask_SlowKeys, &hf_x11_xkb_SetControls_affectEnabledControls_mask_BounceKeys, @@ -23830,7 +23830,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 4; { - const int* enabledControls_bits [] = { + int* const enabledControls_bits [] = { &hf_x11_xkb_SetControls_enabledControls_mask_RepeatKeys, &hf_x11_xkb_SetControls_enabledControls_mask_SlowKeys, &hf_x11_xkb_SetControls_enabledControls_mask_BounceKeys, @@ -23850,7 +23850,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 4; { - const int* changeControls_bits [] = { + int* const changeControls_bits [] = { &hf_x11_xkb_SetControls_changeControls_mask_GroupsWrap, &hf_x11_xkb_SetControls_changeControls_mask_InternalMods, &hf_x11_xkb_SetControls_changeControls_mask_IgnoreLockMods, @@ -23882,7 +23882,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXTimeout, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* accessXTimeoutMask_bits [] = { + int* const accessXTimeoutMask_bits [] = { &hf_x11_xkb_SetControls_accessXTimeoutMask_mask_RepeatKeys, &hf_x11_xkb_SetControls_accessXTimeoutMask_mask_SlowKeys, &hf_x11_xkb_SetControls_accessXTimeoutMask_mask_BounceKeys, @@ -23902,7 +23902,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 4; { - const int* accessXTimeoutValues_bits [] = { + int* const accessXTimeoutValues_bits [] = { &hf_x11_xkb_SetControls_accessXTimeoutValues_mask_RepeatKeys, &hf_x11_xkb_SetControls_accessXTimeoutValues_mask_SlowKeys, &hf_x11_xkb_SetControls_accessXTimeoutValues_mask_BounceKeys, @@ -23922,7 +23922,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 4; { - const int* accessXTimeoutOptionsMask_bits [] = { + int* const accessXTimeoutOptionsMask_bits [] = { &hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SKPressFB, &hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SKAcceptFB, &hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_FeatureFB, @@ -23941,7 +23941,7 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* accessXTimeoutOptionsValues_bits [] = { + int* const accessXTimeoutOptionsValues_bits [] = { &hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SKPressFB, &hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SKAcceptFB, &hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_FeatureFB, @@ -23968,7 +23968,7 @@ static void xkbGetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto proto_tree_add_item(t, hf_x11_xkb_GetMap_deviceSpec, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* full_bits [] = { + int* const full_bits [] = { &hf_x11_xkb_GetMap_full_mask_KeyTypes, &hf_x11_xkb_GetMap_full_mask_KeySyms, &hf_x11_xkb_GetMap_full_mask_ModifierMap, @@ -23983,7 +23983,7 @@ static void xkbGetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto } *offsetp += 2; { - const int* partial_bits [] = { + int* const partial_bits [] = { &hf_x11_xkb_GetMap_partial_mask_KeyTypes, &hf_x11_xkb_GetMap_partial_mask_KeySyms, &hf_x11_xkb_GetMap_partial_mask_ModifierMap, @@ -24014,7 +24014,7 @@ static void xkbGetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto proto_tree_add_item(t, hf_x11_xkb_GetMap_nKeyBehaviors, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_GetMap_virtualMods_mask_0, &hf_x11_xkb_GetMap_virtualMods_mask_1, &hf_x11_xkb_GetMap_virtualMods_mask_2, @@ -24084,7 +24084,7 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro *offsetp += 1; f_present = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* present_bits [] = { + int* const present_bits [] = { &hf_x11_xkb_GetMap_reply_present_mask_KeyTypes, &hf_x11_xkb_GetMap_reply_present_mask_KeySyms, &hf_x11_xkb_GetMap_reply_present_mask_ModifierMap, @@ -24152,7 +24152,7 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro *offsetp += 1; f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_GetMap_reply_virtualMods_mask_0, &hf_x11_xkb_GetMap_reply_virtualMods_mask_1, &hf_x11_xkb_GetMap_reply_virtualMods_mask_2, @@ -24233,7 +24233,7 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto *offsetp += 2; f_present = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* present_bits [] = { + int* const present_bits [] = { &hf_x11_xkb_SetMap_present_mask_KeyTypes, &hf_x11_xkb_SetMap_present_mask_KeySyms, &hf_x11_xkb_SetMap_present_mask_ModifierMap, @@ -24248,7 +24248,7 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto } *offsetp += 2; { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_xkb_SetMap_flags_mask_ResizeTypes, &hf_x11_xkb_SetMap_flags_mask_RecomputeActions, NULL @@ -24310,7 +24310,7 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto *offsetp += 1; f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_SetMap_virtualMods_mask_0, &hf_x11_xkb_SetMap_virtualMods_mask_1, &hf_x11_xkb_SetMap_virtualMods_mask_2, @@ -24383,7 +24383,7 @@ static void xkbGetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_deviceSpec, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* groups_bits [] = { + int* const groups_bits [] = { &hf_x11_xkb_GetCompatMap_groups_mask_Group1, &hf_x11_xkb_GetCompatMap_groups_mask_Group2, &hf_x11_xkb_GetCompatMap_groups_mask_Group3, @@ -24419,7 +24419,7 @@ static void xkbGetCompatMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 4; f_groupsRtrn = tvb_get_guint8(tvb, *offsetp); { - const int* groupsRtrn_bits [] = { + int* const groupsRtrn_bits [] = { &hf_x11_xkb_GetCompatMap_reply_groupsRtrn_mask_Group1, &hf_x11_xkb_GetCompatMap_reply_groupsRtrn_mask_Group2, &hf_x11_xkb_GetCompatMap_reply_groupsRtrn_mask_Group3, @@ -24458,7 +24458,7 @@ static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 1; f_groups = tvb_get_guint8(tvb, *offsetp); { - const int* groups_bits [] = { + int* const groups_bits [] = { &hf_x11_xkb_SetCompatMap_groups_mask_Group1, &hf_x11_xkb_SetCompatMap_groups_mask_Group2, &hf_x11_xkb_SetCompatMap_groups_mask_Group3, @@ -24597,7 +24597,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_ndx, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* map_flags_bits [] = { + int* const map_flags_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_flags_mask_LEDDrivesKB, &hf_x11_xkb_GetNamedIndicator_reply_map_flags_mask_NoAutomatic, &hf_x11_xkb_GetNamedIndicator_reply_map_flags_mask_NoExplicit, @@ -24607,7 +24607,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 1; { - const int* map_whichGroups_bits [] = { + int* const map_whichGroups_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_whichGroups_mask_UseBase, &hf_x11_xkb_GetNamedIndicator_reply_map_whichGroups_mask_UseLatched, &hf_x11_xkb_GetNamedIndicator_reply_map_whichGroups_mask_UseLocked, @@ -24619,7 +24619,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 1; { - const int* map_groups_bits [] = { + int* const map_groups_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_groups_mask_Any, NULL }; @@ -24627,7 +24627,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 1; { - const int* map_whichMods_bits [] = { + int* const map_whichMods_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_whichMods_mask_UseBase, &hf_x11_xkb_GetNamedIndicator_reply_map_whichMods_mask_UseLatched, &hf_x11_xkb_GetNamedIndicator_reply_map_whichMods_mask_UseLocked, @@ -24639,7 +24639,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 1; { - const int* map_mods_bits [] = { + int* const map_mods_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_mods_mask_Shift, &hf_x11_xkb_GetNamedIndicator_reply_map_mods_mask_Lock, &hf_x11_xkb_GetNamedIndicator_reply_map_mods_mask_Control, @@ -24655,7 +24655,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 1; { - const int* map_realMods_bits [] = { + int* const map_realMods_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_realMods_mask_Shift, &hf_x11_xkb_GetNamedIndicator_reply_map_realMods_mask_Lock, &hf_x11_xkb_GetNamedIndicator_reply_map_realMods_mask_Control, @@ -24671,7 +24671,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 1; { - const int* map_vmod_bits [] = { + int* const map_vmod_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_vmod_mask_0, &hf_x11_xkb_GetNamedIndicator_reply_map_vmod_mask_1, &hf_x11_xkb_GetNamedIndicator_reply_map_vmod_mask_2, @@ -24694,7 +24694,7 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o } *offsetp += 2; { - const int* map_ctrls_bits [] = { + int* const map_ctrls_bits [] = { &hf_x11_xkb_GetNamedIndicator_reply_map_ctrls_mask_RepeatKeys, &hf_x11_xkb_GetNamedIndicator_reply_map_ctrls_mask_SlowKeys, &hf_x11_xkb_GetNamedIndicator_reply_map_ctrls_mask_BounceKeys, @@ -24740,7 +24740,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; { - const int* map_flags_bits [] = { + int* const map_flags_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_flags_mask_LEDDrivesKB, &hf_x11_xkb_SetNamedIndicator_map_flags_mask_NoAutomatic, &hf_x11_xkb_SetNamedIndicator_map_flags_mask_NoExplicit, @@ -24750,7 +24750,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off } *offsetp += 1; { - const int* map_whichGroups_bits [] = { + int* const map_whichGroups_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_whichGroups_mask_UseBase, &hf_x11_xkb_SetNamedIndicator_map_whichGroups_mask_UseLatched, &hf_x11_xkb_SetNamedIndicator_map_whichGroups_mask_UseLocked, @@ -24762,7 +24762,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off } *offsetp += 1; { - const int* map_groups_bits [] = { + int* const map_groups_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_groups_mask_Any, NULL }; @@ -24770,7 +24770,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off } *offsetp += 1; { - const int* map_whichMods_bits [] = { + int* const map_whichMods_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_whichMods_mask_UseBase, &hf_x11_xkb_SetNamedIndicator_map_whichMods_mask_UseLatched, &hf_x11_xkb_SetNamedIndicator_map_whichMods_mask_UseLocked, @@ -24782,7 +24782,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off } *offsetp += 1; { - const int* map_realMods_bits [] = { + int* const map_realMods_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_realMods_mask_Shift, &hf_x11_xkb_SetNamedIndicator_map_realMods_mask_Lock, &hf_x11_xkb_SetNamedIndicator_map_realMods_mask_Control, @@ -24798,7 +24798,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off } *offsetp += 1; { - const int* map_vmods_bits [] = { + int* const map_vmods_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_vmods_mask_0, &hf_x11_xkb_SetNamedIndicator_map_vmods_mask_1, &hf_x11_xkb_SetNamedIndicator_map_vmods_mask_2, @@ -24821,7 +24821,7 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off } *offsetp += 2; { - const int* map_ctrls_bits [] = { + int* const map_ctrls_bits [] = { &hf_x11_xkb_SetNamedIndicator_map_ctrls_mask_RepeatKeys, &hf_x11_xkb_SetNamedIndicator_map_ctrls_mask_SlowKeys, &hf_x11_xkb_SetNamedIndicator_map_ctrls_mask_BounceKeys, @@ -24849,7 +24849,7 @@ static void xkbGetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* which_bits [] = { + int* const which_bits [] = { &hf_x11_xkb_GetNames_which_mask_Keycodes, &hf_x11_xkb_GetNames_which_mask_Geometry, &hf_x11_xkb_GetNames_which_mask_Symbols, @@ -24895,7 +24895,7 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p *offsetp += 4; f_which = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* which_bits [] = { + int* const which_bits [] = { &hf_x11_xkb_GetNames_reply_which_mask_Keycodes, &hf_x11_xkb_GetNames_reply_which_mask_Geometry, &hf_x11_xkb_GetNames_reply_which_mask_Symbols, @@ -24924,7 +24924,7 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p *offsetp += 1; f_groupNames = tvb_get_guint8(tvb, *offsetp); { - const int* groupNames_bits [] = { + int* const groupNames_bits [] = { &hf_x11_xkb_GetNames_reply_groupNames_mask_Group1, &hf_x11_xkb_GetNames_reply_groupNames_mask_Group2, &hf_x11_xkb_GetNames_reply_groupNames_mask_Group3, @@ -24936,7 +24936,7 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p *offsetp += 1; f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_GetNames_reply_virtualMods_mask_0, &hf_x11_xkb_GetNames_reply_virtualMods_mask_1, &hf_x11_xkb_GetNames_reply_virtualMods_mask_2, @@ -25052,7 +25052,7 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro *offsetp += 2; f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_SetNames_virtualMods_mask_0, &hf_x11_xkb_SetNames_virtualMods_mask_1, &hf_x11_xkb_SetNames_virtualMods_mask_2, @@ -25076,7 +25076,7 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro *offsetp += 2; f_which = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* which_bits [] = { + int* const which_bits [] = { &hf_x11_xkb_SetNames_which_mask_Keycodes, &hf_x11_xkb_SetNames_which_mask_Geometry, &hf_x11_xkb_SetNames_which_mask_Symbols, @@ -25110,7 +25110,7 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro *offsetp += 4; f_groupNames = tvb_get_guint8(tvb, *offsetp); { - const int* groupNames_bits [] = { + int* const groupNames_bits [] = { &hf_x11_xkb_SetNames_groupNames_mask_Group1, &hf_x11_xkb_SetNames_groupNames_mask_Group2, &hf_x11_xkb_SetNames_groupNames_mask_Group3, @@ -25214,7 +25214,7 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* change_bits [] = { + int* const change_bits [] = { &hf_x11_xkb_PerClientFlags_change_mask_DetectableAutoRepeat, &hf_x11_xkb_PerClientFlags_change_mask_GrabsUseXKBState, &hf_x11_xkb_PerClientFlags_change_mask_AutoResetControls, @@ -25226,7 +25226,7 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset } *offsetp += 4; { - const int* value_bits [] = { + int* const value_bits [] = { &hf_x11_xkb_PerClientFlags_value_mask_DetectableAutoRepeat, &hf_x11_xkb_PerClientFlags_value_mask_GrabsUseXKBState, &hf_x11_xkb_PerClientFlags_value_mask_AutoResetControls, @@ -25238,7 +25238,7 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset } *offsetp += 4; { - const int* ctrlsToChange_bits [] = { + int* const ctrlsToChange_bits [] = { &hf_x11_xkb_PerClientFlags_ctrlsToChange_mask_RepeatKeys, &hf_x11_xkb_PerClientFlags_ctrlsToChange_mask_SlowKeys, &hf_x11_xkb_PerClientFlags_ctrlsToChange_mask_BounceKeys, @@ -25258,7 +25258,7 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset } *offsetp += 4; { - const int* autoCtrls_bits [] = { + int* const autoCtrls_bits [] = { &hf_x11_xkb_PerClientFlags_autoCtrls_mask_RepeatKeys, &hf_x11_xkb_PerClientFlags_autoCtrls_mask_SlowKeys, &hf_x11_xkb_PerClientFlags_autoCtrls_mask_BounceKeys, @@ -25278,7 +25278,7 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset } *offsetp += 4; { - const int* autoCtrlsValues_bits [] = { + int* const autoCtrlsValues_bits [] = { &hf_x11_xkb_PerClientFlags_autoCtrlsValues_mask_RepeatKeys, &hf_x11_xkb_PerClientFlags_autoCtrlsValues_mask_SlowKeys, &hf_x11_xkb_PerClientFlags_autoCtrlsValues_mask_BounceKeys, @@ -25314,7 +25314,7 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* supported_bits [] = { + int* const supported_bits [] = { &hf_x11_xkb_PerClientFlags_reply_supported_mask_DetectableAutoRepeat, &hf_x11_xkb_PerClientFlags_reply_supported_mask_GrabsUseXKBState, &hf_x11_xkb_PerClientFlags_reply_supported_mask_AutoResetControls, @@ -25326,7 +25326,7 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs } *offsetp += 4; { - const int* value_bits [] = { + int* const value_bits [] = { &hf_x11_xkb_PerClientFlags_reply_value_mask_DetectableAutoRepeat, &hf_x11_xkb_PerClientFlags_reply_value_mask_GrabsUseXKBState, &hf_x11_xkb_PerClientFlags_reply_value_mask_AutoResetControls, @@ -25338,7 +25338,7 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs } *offsetp += 4; { - const int* autoCtrls_bits [] = { + int* const autoCtrls_bits [] = { &hf_x11_xkb_PerClientFlags_reply_autoCtrls_mask_RepeatKeys, &hf_x11_xkb_PerClientFlags_reply_autoCtrls_mask_SlowKeys, &hf_x11_xkb_PerClientFlags_reply_autoCtrls_mask_BounceKeys, @@ -25358,7 +25358,7 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs } *offsetp += 4; { - const int* autoCtrlsValues_bits [] = { + int* const autoCtrlsValues_bits [] = { &hf_x11_xkb_PerClientFlags_reply_autoCtrlsValues_mask_RepeatKeys, &hf_x11_xkb_PerClientFlags_reply_autoCtrlsValues_mask_SlowKeys, &hf_x11_xkb_PerClientFlags_reply_autoCtrlsValues_mask_BounceKeys, @@ -25444,7 +25444,7 @@ static void xkbGetKbdByName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_deviceSpec, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* need_bits [] = { + int* const need_bits [] = { &hf_x11_xkb_GetKbdByName_need_mask_Types, &hf_x11_xkb_GetKbdByName_need_mask_CompatMap, &hf_x11_xkb_GetKbdByName_need_mask_ClientSymbols, @@ -25459,7 +25459,7 @@ static void xkbGetKbdByName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, } *offsetp += 2; { - const int* want_bits [] = { + int* const want_bits [] = { &hf_x11_xkb_GetKbdByName_want_mask_Types, &hf_x11_xkb_GetKbdByName_want_mask_CompatMap, &hf_x11_xkb_GetKbdByName_want_mask_ClientSymbols, @@ -25503,7 +25503,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_newKeyboard, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* found_bits [] = { + int* const found_bits [] = { &hf_x11_xkb_GetKbdByName_reply_found_mask_Types, &hf_x11_xkb_GetKbdByName_reply_found_mask_CompatMap, &hf_x11_xkb_GetKbdByName_reply_found_mask_ClientSymbols, @@ -25519,7 +25519,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 2; f_reported = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* reported_bits [] = { + int* const reported_bits [] = { &hf_x11_xkb_GetKbdByName_reply_reported_mask_Types, &hf_x11_xkb_GetKbdByName_reply_reported_mask_CompatMap, &hf_x11_xkb_GetKbdByName_reply_reported_mask_ClientSymbols, @@ -25562,7 +25562,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 1; f_present = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* present_bits [] = { + int* const present_bits [] = { &hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeyTypes, &hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeySyms, &hf_x11_xkb_GetKbdByName_reply_Types_present_mask_ModifierMap, @@ -25630,7 +25630,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 1; f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_GetKbdByName_reply_Types_virtualMods_mask_0, &hf_x11_xkb_GetKbdByName_reply_Types_virtualMods_mask_1, &hf_x11_xkb_GetKbdByName_reply_Types_virtualMods_mask_2, @@ -25707,7 +25707,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 4; f_groupsRtrn = tvb_get_guint8(tvb, *offsetp); { - const int* groupsRtrn_bits [] = { + int* const groupsRtrn_bits [] = { &hf_x11_xkb_GetKbdByName_reply_CompatMap_groupsRtrn_mask_Group1, &hf_x11_xkb_GetKbdByName_reply_CompatMap_groupsRtrn_mask_Group2, &hf_x11_xkb_GetKbdByName_reply_CompatMap_groupsRtrn_mask_Group3, @@ -25771,7 +25771,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 4; f_which = tvb_get_guint32(tvb, *offsetp, byte_order); { - const int* which_bits [] = { + int* const which_bits [] = { &hf_x11_xkb_GetKbdByName_reply_KeyNames_which_mask_Keycodes, &hf_x11_xkb_GetKbdByName_reply_KeyNames_which_mask_Geometry, &hf_x11_xkb_GetKbdByName_reply_KeyNames_which_mask_Symbols, @@ -25800,7 +25800,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 1; f_groupNames = tvb_get_guint8(tvb, *offsetp); { - const int* groupNames_bits [] = { + int* const groupNames_bits [] = { &hf_x11_xkb_GetKbdByName_reply_KeyNames_groupNames_mask_Group1, &hf_x11_xkb_GetKbdByName_reply_KeyNames_groupNames_mask_Group2, &hf_x11_xkb_GetKbdByName_reply_KeyNames_groupNames_mask_Group3, @@ -25812,7 +25812,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset *offsetp += 1; f_virtualMods = tvb_get_guint16(tvb, *offsetp, byte_order); { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_GetKbdByName_reply_KeyNames_virtualMods_mask_0, &hf_x11_xkb_GetKbdByName_reply_KeyNames_virtualMods_mask_1, &hf_x11_xkb_GetKbdByName_reply_KeyNames_virtualMods_mask_2, @@ -25957,7 +25957,7 @@ static void xkbGetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_deviceSpec, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* wanted_bits [] = { + int* const wanted_bits [] = { &hf_x11_xkb_GetDeviceInfo_wanted_mask_Keyboards, &hf_x11_xkb_GetDeviceInfo_wanted_mask_ButtonActions, &hf_x11_xkb_GetDeviceInfo_wanted_mask_IndicatorNames, @@ -25998,7 +25998,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); *offsetp += 4; { - const int* present_bits [] = { + int* const present_bits [] = { &hf_x11_xkb_GetDeviceInfo_reply_present_mask_Keyboards, &hf_x11_xkb_GetDeviceInfo_reply_present_mask_ButtonActions, &hf_x11_xkb_GetDeviceInfo_reply_present_mask_IndicatorNames, @@ -26010,7 +26010,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse } *offsetp += 2; { - const int* supported_bits [] = { + int* const supported_bits [] = { &hf_x11_xkb_GetDeviceInfo_reply_supported_mask_Keyboards, &hf_x11_xkb_GetDeviceInfo_reply_supported_mask_ButtonActions, &hf_x11_xkb_GetDeviceInfo_reply_supported_mask_IndicatorNames, @@ -26022,7 +26022,7 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse } *offsetp += 2; { - const int* unsupported_bits [] = { + int* const unsupported_bits [] = { &hf_x11_xkb_GetDeviceInfo_reply_unsupported_mask_Keyboards, &hf_x11_xkb_GetDeviceInfo_reply_unsupported_mask_ButtonActions, &hf_x11_xkb_GetDeviceInfo_reply_unsupported_mask_IndicatorNames, @@ -26079,7 +26079,7 @@ static void xkbSetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_nBtns, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* change_bits [] = { + int* const change_bits [] = { &hf_x11_xkb_SetDeviceInfo_change_mask_Keyboards, &hf_x11_xkb_SetDeviceInfo_change_mask_ButtonActions, &hf_x11_xkb_SetDeviceInfo_change_mask_IndicatorNames, @@ -26157,7 +26157,7 @@ static void xkbMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_ proto_tree_add_item(t, hf_x11_xkb_MapNotify_ptrBtnActions, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* changed_bits [] = { + int* const changed_bits [] = { &hf_x11_xkb_MapNotify_changed_mask_KeyTypes, &hf_x11_xkb_MapNotify_changed_mask_KeySyms, &hf_x11_xkb_MapNotify_changed_mask_ModifierMap, @@ -26204,7 +26204,7 @@ static void xkbMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_ proto_tree_add_item(t, hf_x11_xkb_MapNotify_nVModMapKeys, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* virtualMods_bits [] = { + int* const virtualMods_bits [] = { &hf_x11_xkb_MapNotify_virtualMods_mask_0, &hf_x11_xkb_MapNotify_virtualMods_mask_1, &hf_x11_xkb_MapNotify_virtualMods_mask_2, @@ -26241,7 +26241,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt proto_tree_add_item(t, hf_x11_xkb_StateNotify_deviceID, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mods_bits [] = { + int* const mods_bits [] = { &hf_x11_xkb_StateNotify_mods_mask_Shift, &hf_x11_xkb_StateNotify_mods_mask_Lock, &hf_x11_xkb_StateNotify_mods_mask_Control, @@ -26257,7 +26257,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* baseMods_bits [] = { + int* const baseMods_bits [] = { &hf_x11_xkb_StateNotify_baseMods_mask_Shift, &hf_x11_xkb_StateNotify_baseMods_mask_Lock, &hf_x11_xkb_StateNotify_baseMods_mask_Control, @@ -26273,7 +26273,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* latchedMods_bits [] = { + int* const latchedMods_bits [] = { &hf_x11_xkb_StateNotify_latchedMods_mask_Shift, &hf_x11_xkb_StateNotify_latchedMods_mask_Lock, &hf_x11_xkb_StateNotify_latchedMods_mask_Control, @@ -26289,7 +26289,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* lockedMods_bits [] = { + int* const lockedMods_bits [] = { &hf_x11_xkb_StateNotify_lockedMods_mask_Shift, &hf_x11_xkb_StateNotify_lockedMods_mask_Lock, &hf_x11_xkb_StateNotify_lockedMods_mask_Control, @@ -26311,7 +26311,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt *offsetp += 2; field8(tvb, offsetp, t, hf_x11_xkb_StateNotify_lockedGroup, byte_order); { - const int* compatState_bits [] = { + int* const compatState_bits [] = { &hf_x11_xkb_StateNotify_compatState_mask_Shift, &hf_x11_xkb_StateNotify_compatState_mask_Lock, &hf_x11_xkb_StateNotify_compatState_mask_Control, @@ -26327,7 +26327,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* grabMods_bits [] = { + int* const grabMods_bits [] = { &hf_x11_xkb_StateNotify_grabMods_mask_Shift, &hf_x11_xkb_StateNotify_grabMods_mask_Lock, &hf_x11_xkb_StateNotify_grabMods_mask_Control, @@ -26343,7 +26343,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* compatGrabMods_bits [] = { + int* const compatGrabMods_bits [] = { &hf_x11_xkb_StateNotify_compatGrabMods_mask_Shift, &hf_x11_xkb_StateNotify_compatGrabMods_mask_Lock, &hf_x11_xkb_StateNotify_compatGrabMods_mask_Control, @@ -26359,7 +26359,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* lookupMods_bits [] = { + int* const lookupMods_bits [] = { &hf_x11_xkb_StateNotify_lookupMods_mask_Shift, &hf_x11_xkb_StateNotify_lookupMods_mask_Lock, &hf_x11_xkb_StateNotify_lookupMods_mask_Control, @@ -26375,7 +26375,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* compatLoockupMods_bits [] = { + int* const compatLoockupMods_bits [] = { &hf_x11_xkb_StateNotify_compatLoockupMods_mask_Shift, &hf_x11_xkb_StateNotify_compatLoockupMods_mask_Lock, &hf_x11_xkb_StateNotify_compatLoockupMods_mask_Control, @@ -26391,7 +26391,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* ptrBtnState_bits [] = { + int* const ptrBtnState_bits [] = { &hf_x11_xkb_StateNotify_ptrBtnState_mask_Shift, &hf_x11_xkb_StateNotify_ptrBtnState_mask_Lock, &hf_x11_xkb_StateNotify_ptrBtnState_mask_Control, @@ -26411,7 +26411,7 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 2; { - const int* changed_bits [] = { + int* const changed_bits [] = { &hf_x11_xkb_StateNotify_changed_mask_ModifierState, &hf_x11_xkb_StateNotify_changed_mask_ModifierBase, &hf_x11_xkb_StateNotify_changed_mask_ModifierLatch, @@ -26456,7 +26456,7 @@ static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 2, ENC_NA); *offsetp += 2; { - const int* changedControls_bits [] = { + int* const changedControls_bits [] = { &hf_x11_xkb_ControlsNotify_changedControls_mask_GroupsWrap, &hf_x11_xkb_ControlsNotify_changedControls_mask_InternalMods, &hf_x11_xkb_ControlsNotify_changedControls_mask_IgnoreLockMods, @@ -26468,7 +26468,7 @@ static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint } *offsetp += 4; { - const int* enabledControls_bits [] = { + int* const enabledControls_bits [] = { &hf_x11_xkb_ControlsNotify_enabledControls_mask_RepeatKeys, &hf_x11_xkb_ControlsNotify_enabledControls_mask_SlowKeys, &hf_x11_xkb_ControlsNotify_enabledControls_mask_BounceKeys, @@ -26488,7 +26488,7 @@ static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint } *offsetp += 4; { - const int* enabledControlChanges_bits [] = { + int* const enabledControlChanges_bits [] = { &hf_x11_xkb_ControlsNotify_enabledControlChanges_mask_RepeatKeys, &hf_x11_xkb_ControlsNotify_enabledControlChanges_mask_SlowKeys, &hf_x11_xkb_ControlsNotify_enabledControlChanges_mask_BounceKeys, @@ -26572,7 +26572,7 @@ static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; { - const int* changed_bits [] = { + int* const changed_bits [] = { &hf_x11_xkb_NamesNotify_changed_mask_Keycodes, &hf_x11_xkb_NamesNotify_changed_mask_Geometry, &hf_x11_xkb_NamesNotify_changed_mask_Symbols, @@ -26607,7 +26607,7 @@ static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt proto_tree_add_item(t, hf_x11_xkb_NamesNotify_nKeyAliases, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* changedGroupNames_bits [] = { + int* const changedGroupNames_bits [] = { &hf_x11_xkb_NamesNotify_changedGroupNames_mask_Group1, &hf_x11_xkb_NamesNotify_changedGroupNames_mask_Group2, &hf_x11_xkb_NamesNotify_changedGroupNames_mask_Group3, @@ -26618,7 +26618,7 @@ static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt } *offsetp += 1; { - const int* changedVirtualMods_bits [] = { + int* const changedVirtualMods_bits [] = { &hf_x11_xkb_NamesNotify_changedVirtualMods_mask_0, &hf_x11_xkb_NamesNotify_changedVirtualMods_mask_1, &hf_x11_xkb_NamesNotify_changedVirtualMods_mask_2, @@ -26661,7 +26661,7 @@ static void xkbCompatMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_deviceID, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* changedGroups_bits [] = { + int* const changedGroups_bits [] = { &hf_x11_xkb_CompatMapNotify_changedGroups_mask_Group1, &hf_x11_xkb_CompatMapNotify_changedGroups_mask_Group2, &hf_x11_xkb_CompatMapNotify_changedGroups_mask_Group3, @@ -26727,7 +26727,7 @@ static void xkbActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b proto_tree_add_item(t, hf_x11_xkb_ActionMessage_keyEventFollows, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* mods_bits [] = { + int* const mods_bits [] = { &hf_x11_xkb_ActionMessage_mods_mask_Shift, &hf_x11_xkb_ActionMessage_mods_mask_Lock, &hf_x11_xkb_ActionMessage_mods_mask_Control, @@ -26761,7 +26761,7 @@ static void xkbAccessXNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_keycode, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* detailt_bits [] = { + int* const detailt_bits [] = { &hf_x11_xkb_AccessXNotify_detailt_mask_SKPress, &hf_x11_xkb_AccessXNotify_detailt_mask_SKAccept, &hf_x11_xkb_AccessXNotify_detailt_mask_SKReject, @@ -26795,7 +26795,7 @@ static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, proto_tree_add_item(t, hf_x11_unused, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; { - const int* reason_bits [] = { + int* const reason_bits [] = { &hf_x11_xkb_ExtensionDeviceNotify_reason_mask_Keyboards, &hf_x11_xkb_ExtensionDeviceNotify_reason_mask_ButtonActions, &hf_x11_xkb_ExtensionDeviceNotify_reason_mask_IndicatorNames, @@ -26818,7 +26818,7 @@ static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_nButtons, tvb, *offsetp, 1, byte_order); *offsetp += 1; { - const int* supported_bits [] = { + int* const supported_bits [] = { &hf_x11_xkb_ExtensionDeviceNotify_supported_mask_Keyboards, &hf_x11_xkb_ExtensionDeviceNotify_supported_mask_ButtonActions, &hf_x11_xkb_ExtensionDeviceNotify_supported_mask_IndicatorNames, @@ -26830,7 +26830,7 @@ static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, } *offsetp += 2; { - const int* unsupported_bits [] = { + int* const unsupported_bits [] = { &hf_x11_xkb_ExtensionDeviceNotify_unsupported_mask_Keyboards, &hf_x11_xkb_ExtensionDeviceNotify_unsupported_mask_ButtonActions, &hf_x11_xkb_ExtensionDeviceNotify_unsupported_mask_IndicatorNames, @@ -28570,7 +28570,7 @@ static void struct_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_num_formats, tvb, *offsetp, 2, byte_order); *offsetp += 2; { - const int* type_bits [] = { + int* const type_bits [] = { &hf_x11_struct_xv_AdaptorInfo_type_mask_InputMask, &hf_x11_struct_xv_AdaptorInfo_type_mask_OutputMask, &hf_x11_struct_xv_AdaptorInfo_type_mask_VideoMask, @@ -28653,7 +28653,7 @@ static void struct_xv_AttributeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *roo item = proto_tree_add_item(root, hf_x11_struct_xv_AttributeInfo, tvb, *offsetp, struct_size_xv_AttributeInfo(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); { - const int* flags_bits [] = { + int* const flags_bits [] = { &hf_x11_struct_xv_AttributeInfo_flags_mask_Gettable, &hf_x11_struct_xv_AttributeInfo_flags_mask_Settable, NULL |