From c69d0114ea18e486742e9746560d002cbc6efbed Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Wed, 30 Nov 2022 08:49:38 +0000 Subject: [PATCH] tools/check_static.py - fix remaining errors --- epan/dissectors/packet-gmr1_bcch.c | 2 +- epan/dissectors/packet-gsm_rlcmac.c | 32 ++++++++++++++--------------- tools/check_static.py | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index c1229c2354..7e6171e7b6 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.c @@ -918,7 +918,7 @@ CSN_DESCR_END (SystemInformation1_t) /* System Information type 2 - [1] 10.1.32 */ -CSN_DESCR_BEGIN(SI2_Block_Header_t) +static CSN_DESCR_BEGIN(SI2_Block_Header_t) M_UINT (SI2_Block_Header_t, Protocol_Version, 4, &hf_si_protocol_version), M_UINT (SI2_Block_Header_t, Block_Type, 1, &hf_si_block_type), M_UINT (SI2_Block_Header_t, Spare, 3, &hf_si_spare), diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index 45ca5fa311..d60335f0a5 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -7591,14 +7591,14 @@ CSN_DESCR_BEGIN (SI6_RestOctet_t) CSN_DESCR_END (SI6_RestOctet_t) #endif -CSN_DESCR_BEGIN (UL_Data_Mac_Header_t) +static CSN_DESCR_BEGIN (UL_Data_Mac_Header_t) M_UINT (UL_Data_Mac_Header_t, Payload_Type, 2, &hf_ul_payload_type), M_UINT (UL_Data_Mac_Header_t, Countdown_Value, 4, &hf_countdown_value), M_UINT (UL_Data_Mac_Header_t, SI, 1, &hf_ul_data_si), M_UINT (UL_Data_Mac_Header_t, R, 1, &hf_ul_retry), CSN_DESCR_END (UL_Data_Mac_Header_t) -CSN_DESCR_BEGIN (UL_Data_Block_GPRS_t) +static CSN_DESCR_BEGIN (UL_Data_Block_GPRS_t) M_TYPE (UL_Data_Block_GPRS_t, UL_Data_Mac_Header, UL_Data_Mac_Header_t), M_UINT (UL_Data_Block_GPRS_t, Spare, 1, &hf_ul_data_spare), M_UINT (UL_Data_Block_GPRS_t, PI, 1, &hf_pi), @@ -7608,7 +7608,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_GPRS_t) M_UINT (UL_Data_Block_GPRS_t, E, 1, &hf_e), CSN_DESCR_END (UL_Data_Block_GPRS_t) -CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type1_t) +static CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type1_t) M_SPLIT_BITS (UL_Data_Block_EGPRS_Header_Type1_t, TFI, bits_spec_ul_tfi, 5, &hf_uplink_tfi), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type1_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EGPRS_Header_Type1_t, Countdown_Value, 4, &hf_countdown_value), @@ -7629,7 +7629,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type1_t) M_UINT (UL_Data_Block_EGPRS_Header_Type1_t, SPARE2, 6, &hf_ul_data_spare), CSN_DESCR_END (UL_Data_Block_EGPRS_Header_Type1_t) -CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type2_t) +static CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type2_t) M_SPLIT_BITS (UL_Data_Block_EGPRS_Header_Type2_t, TFI, bits_spec_ul_tfi, 5, &hf_uplink_tfi), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type2_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EGPRS_Header_Type2_t, Countdown_Value, 4, &hf_countdown_value), @@ -7649,7 +7649,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type2_t) M_UINT (UL_Data_Block_EGPRS_Header_Type2_t, SPARE2, 5, &hf_ul_data_spare), CSN_DESCR_END (UL_Data_Block_EGPRS_Header_Type2_t) -CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type3_t) +static CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type3_t) M_SPLIT_BITS (UL_Data_Block_EGPRS_Header_Type3_t, TFI, bits_spec_ul_tfi, 5, &hf_uplink_tfi), M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type3_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EGPRS_Header_Type3_t, Countdown_Value, 4, &hf_countdown_value), @@ -7669,7 +7669,7 @@ CSN_DESCR_BEGIN (UL_Data_Block_EGPRS_Header_Type3_t) M_BITS_CRUMB (UL_Data_Block_EGPRS_Header_Type3_t, CPS, bits_spec_ul_type3_cps, 0, &hf_cps3), CSN_DESCR_END (UL_Data_Block_EGPRS_Header_Type3_t) -CSN_DESCR_BEGIN (UL_Data_Block_EC_EGPRS_Header_Type3_t) +static CSN_DESCR_BEGIN (UL_Data_Block_EC_EGPRS_Header_Type3_t) M_SPLIT_BITS (UL_Data_Block_EC_EGPRS_Header_Type3_t, TFI, bits_spec_ul_tfi, 5, &hf_uplink_tfi), M_BITS_CRUMB (UL_Data_Block_EC_EGPRS_Header_Type3_t, TFI, bits_spec_ul_tfi, 1, &hf_uplink_tfi), M_UINT (UL_Data_Block_EC_EGPRS_Header_Type3_t, Countdown_Value, 4, &hf_countdown_value), @@ -7687,29 +7687,29 @@ CSN_DESCR_BEGIN (UL_Data_Block_EC_EGPRS_Header_Type3_t) M_BITS_CRUMB (UL_Data_Block_EC_EGPRS_Header_Type3_t, DL_CC_EST, bits_spec_ul_ec_type3_dl_cc_est, 0, &hf_ec_dl_cc_est), CSN_DESCR_END (UL_Data_Block_EC_EGPRS_Header_Type3_t) -CSN_DESCR_BEGIN (UL_Packet_Control_Ack_11_t) +static CSN_DESCR_BEGIN (UL_Packet_Control_Ack_11_t) M_UINT (UL_Packet_Control_Ack_11_t, MESSAGE_TYPE, 9, &hf_prach11_message_type_9), M_UINT (UL_Packet_Control_Ack_11_t, CTRL_ACK, 2, &hf_packet_control_acknowledgement_ctrl_ack), CSN_DESCR_END (UL_Packet_Control_Ack_11_t) -CSN_DESCR_BEGIN (UL_Packet_Control_Ack_TN_RRBP_11_t) +static CSN_DESCR_BEGIN (UL_Packet_Control_Ack_TN_RRBP_11_t) M_UINT (UL_Packet_Control_Ack_TN_RRBP_11_t, MESSAGE_TYPE, 6, &hf_prach11_message_type_6), M_UINT (UL_Packet_Control_Ack_TN_RRBP_11_t, TN_RRBP, 3, &hf_packet_control_acknowledgement_additionsr5_tn_rrbp), M_UINT (UL_Packet_Control_Ack_TN_RRBP_11_t, CTRL_ACK, 2, &hf_packet_control_acknowledgement_ctrl_ack), CSN_DESCR_END (UL_Packet_Control_Ack_TN_RRBP_11_t) -CSN_DESCR_BEGIN (UL_Packet_Control_Ack_8_t) +static CSN_DESCR_BEGIN (UL_Packet_Control_Ack_8_t) M_UINT (UL_Packet_Control_Ack_8_t, MESSAGE_TYPE, 6, &hf_prach8_message_type_6), M_UINT (UL_Packet_Control_Ack_8_t, CTRL_ACK, 2, &hf_packet_control_acknowledgement_ctrl_ack), CSN_DESCR_END (UL_Packet_Control_Ack_8_t) -CSN_DESCR_BEGIN (UL_Packet_Control_Ack_TN_RRBP_8_t) +static CSN_DESCR_BEGIN (UL_Packet_Control_Ack_TN_RRBP_8_t) M_UINT (UL_Packet_Control_Ack_TN_RRBP_8_t, MESSAGE_TYPE, 3, &hf_prach8_message_type_3), M_UINT (UL_Packet_Control_Ack_TN_RRBP_8_t, TN_RRBP, 3, &hf_packet_control_acknowledgement_additionsr5_tn_rrbp), M_UINT (UL_Packet_Control_Ack_TN_RRBP_8_t, CTRL_ACK, 2, &hf_packet_control_acknowledgement_ctrl_ack), CSN_DESCR_END (UL_Packet_Control_Ack_TN_RRBP_8_t) -CSN_DESCR_BEGIN (DL_Data_Mac_Header_t) +static CSN_DESCR_BEGIN (DL_Data_Mac_Header_t) M_UINT (DL_Data_Mac_Header_t, Payload_Type, 2, &hf_dl_payload_type), M_UINT (DL_Data_Mac_Header_t, RRBP, 2, &hf_rrbp), M_UINT (DL_Data_Mac_Header_t, S_P, 1, &hf_s_p), @@ -7717,7 +7717,7 @@ CSN_DESCR_BEGIN (DL_Data_Mac_Header_t) CSN_DESCR_END (DL_Data_Mac_Header_t) -CSN_DESCR_BEGIN (DL_Data_Block_GPRS_t) +static CSN_DESCR_BEGIN (DL_Data_Block_GPRS_t) M_TYPE (DL_Data_Block_GPRS_t, DL_Data_Mac_Header, DL_Data_Mac_Header_t), M_UINT (DL_Data_Block_GPRS_t, Power_Reduction, 2, &hf_dl_ctrl_pr), M_UINT (DL_Data_Block_GPRS_t, TFI, 5, &hf_downlink_tfi), @@ -7726,7 +7726,7 @@ CSN_DESCR_BEGIN (DL_Data_Block_GPRS_t) M_UINT (DL_Data_Block_GPRS_t, E, 1, &hf_e), CSN_DESCR_END (DL_Data_Block_GPRS_t) -CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type1_t) +static CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type1_t) M_SPLIT_BITS (DL_Data_Block_EGPRS_Header_Type1_t, TFI, bits_spec_dl_tfi, 5, &hf_downlink_tfi), M_BITS_CRUMB (DL_Data_Block_EGPRS_Header_Type1_t, TFI, bits_spec_dl_tfi, 1, &hf_downlink_tfi), M_UINT (DL_Data_Block_EGPRS_Header_Type1_t, RRBP, 2, &hf_rrbp), @@ -7744,7 +7744,7 @@ CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type1_t) M_BITS_CRUMB (DL_Data_Block_EGPRS_Header_Type1_t, BSN2_offset, bits_spec_dl_type1_bsn2, 0, &hf_bsn2_offset), CSN_DESCR_END (DL_Data_Block_EGPRS_Header_Type1_t) -CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type2_t) +static CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type2_t) M_SPLIT_BITS (DL_Data_Block_EGPRS_Header_Type2_t, TFI, bits_spec_dl_tfi, 5, &hf_downlink_tfi), M_BITS_CRUMB (DL_Data_Block_EGPRS_Header_Type2_t, TFI, bits_spec_dl_tfi, 1, &hf_downlink_tfi), M_UINT (DL_Data_Block_EGPRS_Header_Type2_t, RRBP, 2, &hf_rrbp), @@ -7760,7 +7760,7 @@ CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type2_t) M_BITS_CRUMB (DL_Data_Block_EGPRS_Header_Type2_t, BSN1, bits_spec_dl_type2_bsn, 0, &hf_bsn), CSN_DESCR_END (DL_Data_Block_EGPRS_Header_Type2_t) -CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type3_t) +static CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type3_t) M_SPLIT_BITS (DL_Data_Block_EGPRS_Header_Type3_t, TFI, bits_spec_dl_tfi, 5, &hf_downlink_tfi), M_BITS_CRUMB (DL_Data_Block_EGPRS_Header_Type3_t, TFI, bits_spec_dl_tfi, 1, &hf_downlink_tfi), M_UINT (DL_Data_Block_EGPRS_Header_Type3_t, RRBP, 2, &hf_rrbp), @@ -7777,7 +7777,7 @@ CSN_DESCR_BEGIN (DL_Data_Block_EGPRS_Header_Type3_t) M_BITS_CRUMB (DL_Data_Block_EGPRS_Header_Type3_t, BSN1, bits_spec_dl_type3_bsn, 0, &hf_bsn), CSN_DESCR_END (DL_Data_Block_EGPRS_Header_Type3_t) -CSN_DESCR_BEGIN (DL_Data_Block_EC_EGPRS_Header_Type3_t) +static CSN_DESCR_BEGIN (DL_Data_Block_EC_EGPRS_Header_Type3_t) M_SPLIT_BITS (DL_Data_Block_EC_EGPRS_Header_Type3_t, TFI, bits_spec_dl_tfi, 5, &hf_downlink_tfi), M_BITS_CRUMB (DL_Data_Block_EC_EGPRS_Header_Type3_t, TFI, bits_spec_dl_tfi, 1, &hf_downlink_tfi), M_UINT (DL_Data_Block_EC_EGPRS_Header_Type3_t, SPARE1, 1, &hf_dl_data_spare), diff --git a/tools/check_static.py b/tools/check_static.py index 4168623ec7..60335b60be 100755 --- a/tools/check_static.py +++ b/tools/check_static.py @@ -46,7 +46,7 @@ class CalledSymbols: else: object_file = os.path.join(build_folder, os.path.dirname(file), 'CMakeFiles', last_dir + '.dir', os.path.basename(file) + '.o') if not os.path.exists(object_file): - print('Warning -', object_file, 'does not exist') + #print('Warning -', object_file, 'does not exist') return command = ['nm', object_file] for f in subprocess.check_output(command).splitlines(): @@ -79,7 +79,7 @@ class DefinedSymbols: object_file = os.path.join(build_folder, 'epan', 'dissectors', 'CMakeFiles', 'dissectors.dir', os.path.basename(file) + '.o') if not os.path.exists(object_file): - print('Warning -', object_file, 'does not exist') + #print('Warning -', object_file, 'does not exist') return header_file= file.replace('.c', '.h')