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 /asn1/ansi_tcap | |
| parent | ab6d043ccc2f2a7967a5acbc2a7f66152051b5ae (diff) | |
| download | wireshark-9fa4a8e6b6b91d5f834586edadd2fefcb2f16642.tar.gz | |
Convert a batch of asn1 dissectors from emem to wmem.
svn path=/trunk/; revision=50057
Diffstat (limited to 'asn1/ansi_tcap')
| -rw-r--r-- | asn1/ansi_tcap/packet-ansi_tcap-template.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c index 86f07ab0aa..6b772da06a 100644 --- a/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -30,7 +30,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/oids.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/asn1.h> #include <epan/strutil.h> @@ -197,13 +197,13 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ /* The hash string needs to contain src and dest to distiguish differnt flows */ switch(ansi_tcap_response_matching_type){ case 0: - buf = ep_strdup(ansi_tcap_private.TransactionID_str); + buf = wmem_strdup(wmem_packet_scope(), ansi_tcap_private.TransactionID_str); break; case 1: - buf = ep_strdup_printf("%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src)); + buf = wmem_strdup_printf(wmem_packet_scope(), "%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src)); break; default: - buf = ep_strdup_printf("%s%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src),ep_address_to_str(dst)); + buf = wmem_strdup_printf(wmem_packet_scope(), "%s%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src),ep_address_to_str(dst)); break; } @@ -212,13 +212,13 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ if(ansi_tcap_saved_invokedata) return; - ansi_tcap_saved_invokedata = se_new(struct ansi_tcap_invokedata_t); + ansi_tcap_saved_invokedata = wmem_new(wmem_file_scope(), struct ansi_tcap_invokedata_t); ansi_tcap_saved_invokedata->OperationCode = ansi_tcap_private.d.OperationCode; ansi_tcap_saved_invokedata->OperationCode_national = ansi_tcap_private.d.OperationCode_national; ansi_tcap_saved_invokedata->OperationCode_private = ansi_tcap_private.d.OperationCode_private; g_hash_table_insert(TransactionId_table, - se_strdup(buf), + wmem_strdup(wmem_file_scope(), buf), ansi_tcap_saved_invokedata); /* g_warning("Tcap Invoke Hash string %s",buf); @@ -238,7 +238,7 @@ find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U } /* The hash string needs to contain src and dest to distiguish differnt flows */ - buf = (char *)ep_alloc(MAX_TID_STR_LEN); + buf = (char *)wmem_alloc(wmem_packet_scope(), MAX_TID_STR_LEN); buf[0] = '\0'; /* Reverse order to invoke */ g_snprintf(buf, MAX_TID_STR_LEN, "%s%s%s", |