diff options
| -rw-r--r-- | epan/dissectors/asn1/rrc/packet-rrc-template.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-rrc.c | 17 |
2 files changed, 8 insertions, 18 deletions
diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c index 3a33a5436b..c63f3f98bd 100644 --- a/epan/dissectors/asn1/rrc/packet-rrc-template.c +++ b/epan/dissectors/asn1/rrc/packet-rrc-template.c @@ -351,11 +351,6 @@ static gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignor return GPOINTER_TO_INT(a_ptr) < GPOINTER_TO_INT(b_ptr); } -static void rrc_free_key(gpointer key _U_){ - /*Keys should be de allocated elsewhere.*/ - -} - static void rrc_free_value(gpointer value ){ g_free(value); } @@ -378,7 +373,7 @@ get_or_create_cipher_info(fp_info *fpinf, rlc_info *rlcinf) { /*Initiate tree with START_PS values.*/ if(!cipher_info->start_ps) cipher_info->start_ps = g_tree_new_full(rrc_key_cmp, - NULL,rrc_free_key,rrc_free_value); + NULL,NULL,rrc_free_value); /*Clear and initialize seq_no matrix*/ for(i = 0; i< 31; i++){ @@ -465,7 +460,7 @@ rrc_init(void) { /*Initialize structure for muxed flow indication*/ hsdsch_muxed_flows = g_tree_new_full(rrc_key_cmp, NULL, /* data pointer, optional */ - rrc_free_key, + NULL, rrc_free_value); rrc_ciph_info_tree = g_tree_new_full(rrc_key_cmp, diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 5c46591a96..37e13fd57c 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -18291,11 +18291,6 @@ static gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignor return GPOINTER_TO_INT(a_ptr) < GPOINTER_TO_INT(b_ptr); } -static void rrc_free_key(gpointer key _U_){ - /*Keys should be de allocated elsewhere.*/ - -} - static void rrc_free_value(gpointer value ){ g_free(value); } @@ -18318,7 +18313,7 @@ get_or_create_cipher_info(fp_info *fpinf, rlc_info *rlcinf) { /*Initiate tree with START_PS values.*/ if(!cipher_info->start_ps) cipher_info->start_ps = g_tree_new_full(rrc_key_cmp, - NULL,rrc_free_key,rrc_free_value); + NULL,NULL,rrc_free_value); /*Clear and initialize seq_no matrix*/ for(i = 0; i< 31; i++){ @@ -163321,7 +163316,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 411 "./asn1/rrc/packet-rrc-template.c" +#line 406 "./asn1/rrc/packet-rrc-template.c" static int @@ -163379,7 +163374,7 @@ rrc_init(void) { /*Initialize structure for muxed flow indication*/ hsdsch_muxed_flows = g_tree_new_full(rrc_key_cmp, NULL, /* data pointer, optional */ - rrc_free_key, + NULL, rrc_free_value); rrc_ciph_info_tree = g_tree_new_full(rrc_key_cmp, @@ -206721,7 +206716,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 494 "./asn1/rrc/packet-rrc-template.c" +#line 489 "./asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -213670,7 +213665,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 544 "./asn1/rrc/packet-rrc-template.c" +#line 539 "./asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, &ett_rrc_ims_info, @@ -213771,7 +213766,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 569 "./asn1/rrc/packet-rrc-template.c" +#line 564 "./asn1/rrc/packet-rrc-template.c" |