diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 14:37:46 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 14:37:46 +0000 |
| commit | 65ff43fada27d83e87c5d7b51702cf990a394cff (patch) | |
| tree | 24aec39426cc8470ed3bc62f02903c286018d684 /epan/dissectors/packet-rrc.c | |
| parent | c65459c729d0ecafd550a2c4ad5fea4caaa4dae0 (diff) | |
Finish asn1 emem -> wmem conversion.
Left are snmp and those functions that don't have wmem equivalents.
svn path=/trunk/; revision=52060
Diffstat (limited to 'epan/dissectors/packet-rrc.c')
| -rw-r--r-- | epan/dissectors/packet-rrc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 8fd0da8c3e..776fc41be1 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -46,6 +46,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/asn1.h> +#include <epan/wmem/wmem.h> #include <epan/conversation.h> #include <epan/expert.h> @@ -278,7 +279,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 98 "../../asn1/rrc/packet-rrc-template.c" +#line 99 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -9921,7 +9922,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 103 "../../asn1/rrc/packet-rrc-template.c" +#line 104 "../../asn1/rrc/packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -16047,7 +16048,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 108 "../../asn1/rrc/packet-rrc-template.c" +#line 109 "../../asn1/rrc/packet-rrc-template.c" static gint ett_rrc_eutraFeatureGroupIndicators = -1; static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1; @@ -20498,7 +20499,7 @@ dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot #line 792 "../../asn1/rrc/rrc.cnf" rrcinf = (struct rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc, 0); if (!rrcinf) { - rrcinf = se_new0(struct rrc_info); + rrcinf = wmem_new0(wmem_file_scope(), struct rrc_info); p_add_proto_data(actx->pinfo->fd, proto_rrc, 0, rrcinf); } rrcinf->hrnti[actx->pinfo->fd->subnum] = tvb_get_ntohs(hrnti_tvb, 0); @@ -143324,7 +143325,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 185 "../../asn1/rrc/packet-rrc-template.c" +#line 186 "../../asn1/rrc/packet-rrc-template.c" #include "packet-rrc.h" @@ -181937,7 +181938,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 265 "../../asn1/rrc/packet-rrc-template.c" +#line 266 "../../asn1/rrc/packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -188084,7 +188085,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 291 "../../asn1/rrc/packet-rrc-template.c" +#line 292 "../../asn1/rrc/packet-rrc-template.c" &ett_rrc_eutraFeatureGroupIndicators, &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo, }; @@ -188173,7 +188174,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 312 "../../asn1/rrc/packet-rrc-template.c" +#line 313 "../../asn1/rrc/packet-rrc-template.c" |