From 48e68367d9d0de933648c93fba9996993848aa5f Mon Sep 17 00:00:00 2001 From: Darien Spencer Date: Thu, 30 Nov 2017 15:43:00 +0200 Subject: rrc: Remove unused GTree Change-Id: I137ac55cd99e659db9d9a496cc82f4427300765d Reviewed-on: https://code.wireshark.org/review/24662 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-rrc.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'epan/dissectors/packet-rrc.c') diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 3a8ee418fc..3cd1dbd07c 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -73,7 +73,6 @@ extern int proto_umts_rlc; /*Handler to RLC*/ GTree * hsdsch_muxed_flows = NULL; GTree * rrc_ciph_info_tree = NULL; -GTree * rrc_scrambling_code_urnti = NULL; wmem_tree_t* rrc_rach_urnti_crnti_map = NULL; static int msg_type _U_; @@ -477,7 +476,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr #define maxWLANs 64 /*--- End of included file: packet-rrc-val.h ---*/ -#line 274 "./asn1/rrc/packet-rrc-template.c" +#line 273 "./asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -11316,7 +11315,7 @@ static int hf_rrc_GsmSecurityCapability_a5_2 = -1; static int hf_rrc_GsmSecurityCapability_a5_1 = -1; /*--- End of included file: packet-rrc-hf.c ---*/ -#line 279 "./asn1/rrc/packet-rrc-template.c" +#line 278 "./asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -18220,7 +18219,7 @@ static gint ett_rrc_UE_RadioAccessCapability_r6 = -1; static gint ett_rrc_UL_RFC3095_Context = -1; /*--- End of included file: packet-rrc-ett.c ---*/ -#line 284 "./asn1/rrc/packet-rrc-template.c" +#line 283 "./asn1/rrc/packet-rrc-template.c" static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; @@ -163199,7 +163198,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 400 "./asn1/rrc/packet-rrc-template.c" +#line 399 "./asn1/rrc/packet-rrc-template.c" static int @@ -163265,12 +163264,6 @@ rrc_init(void) { NULL, rrc_free_value); - /*Initialize Scrambling code to U-RNTI dictionary*/ - rrc_scrambling_code_urnti = g_tree_new_full(rrc_key_cmp, - NULL, - NULL, - NULL); - /* Global U-RNTI / C-RNTI map to be used in RACH channels */ rrc_rach_urnti_crnti_map = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); } @@ -163280,7 +163273,6 @@ rrc_cleanup(void) { /*Cleanup*/ g_tree_destroy(hsdsch_muxed_flows); g_tree_destroy(rrc_ciph_info_tree); - g_tree_destroy(rrc_scrambling_code_urnti); } /*--- proto_register_rrc -------------------------------------------*/ @@ -206606,7 +206598,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 490 "./asn1/rrc/packet-rrc-template.c" +#line 482 "./asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -213555,7 +213547,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 540 "./asn1/rrc/packet-rrc-template.c" +#line 532 "./asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, &ett_rrc_ims_info, @@ -213656,7 +213648,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 565 "./asn1/rrc/packet-rrc-template.c" +#line 557 "./asn1/rrc/packet-rrc-template.c" -- cgit v1.2.3