diff options
| author | Evan Huus <eapache@gmail.com> | 2013-06-19 20:43:03 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-06-19 20:43:03 +0000 |
| commit | 9fa4a8e6b6b91d5f834586edadd2fefcb2f16642 (patch) | |
| tree | 36264d0b0290b0a1468badd6f298fdc138d9c3b1 /epan/dissectors/packet-acse.c | |
| parent | ab6d043ccc2f2a7967a5acbc2a7f66152051b5ae (diff) | |
Convert a batch of asn1 dissectors from emem to wmem.
svn path=/trunk/; revision=50057
Diffstat (limited to 'epan/dissectors/packet-acse.c')
| -rw-r--r-- | epan/dissectors/packet-acse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 2a7b87e000..f101c6a1fa 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -46,7 +46,7 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/expert.h> #include <epan/oids.h> #include <epan/asn1.h> @@ -286,9 +286,9 @@ static void register_ctx_id_and_oid(packet_info *pinfo _U_, guint32 idx, char *oid) { acse_ctx_oid_t *aco, *tmpaco; - aco=se_alloc(sizeof(acse_ctx_oid_t)); + aco=wmem_new(wmem_file_scope(), acse_ctx_oid_t); aco->ctx_id=idx; - aco->oid=se_strdup(oid); + aco->oid=wmem_strdup(wmem_file_scope(), oid); /* if this ctx already exists, remove the old one first */ tmpaco=(acse_ctx_oid_t *)g_hash_table_lookup(acse_ctx_oid_table, aco); @@ -1726,7 +1726,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(session->spdu_type == 0 ) { if(parent_tree){ REPORT_DISSECTOR_BUG( - ep_strdup_printf("Wrong spdu type %x from session dissector.",session->spdu_type)); + wmem_strdup_printf(wmem_packet_scope(), "Wrong spdu type %x from session dissector.",session->spdu_type)); return ; } } |