diff options
Diffstat (limited to 'epan/dissectors/packet-rrc.c')
| -rw-r--r-- | epan/dissectors/packet-rrc.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index d1b51160c2..c0023e8b35 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -143866,14 +143866,8 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static void rrc_init(void){ - /*Cleanup*/ - if(hsdsch_muxed_flows){ - g_tree_destroy(hsdsch_muxed_flows); - } - if(rrc_ciph_inf){ - g_tree_destroy(rrc_ciph_inf); - } +static void +rrc_init(void) { /*Initialize structure for muxed flow indication*/ hsdsch_muxed_flows = g_tree_new_full(rrc_key_cmp, NULL, /* data pointer, optional */ @@ -143886,6 +143880,14 @@ static void rrc_init(void){ NULL, rrc_free_value); } + +static void +rrc_cleanup(void) { + /*Cleanup*/ + g_tree_destroy(hsdsch_muxed_flows); + g_tree_destroy(rrc_ciph_inf); +} + /*--- proto_register_rrc -------------------------------------------*/ void proto_register_rrc(void) { @@ -182537,7 +182539,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 272 "../../asn1/rrc/packet-rrc-template.c" +#line 274 "../../asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -188723,7 +188725,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 314 "../../asn1/rrc/packet-rrc-template.c" +#line 316 "../../asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, &ett_rrc_ims_info, @@ -188813,12 +188815,13 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 336 "../../asn1/rrc/packet-rrc-template.c" +#line 338 "../../asn1/rrc/packet-rrc-template.c" register_init_routine(rrc_init); + register_cleanup_routine(rrc_cleanup); } |