diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-08 13:59:33 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-09 05:54:38 +0000 |
| commit | d296c75247b2b176e728cfdcf24a2f20d6fa2449 (patch) | |
| tree | a515dbc32a23073321dabe5b704e6b35db2cade1 /epan/guid-utils.c | |
| parent | 45cbdbc70a97d0fc4f05cc5a59e1f42fe6b124e5 (diff) | |
Some more random removal of ep_ memory.
Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac
Reviewed-on: https://code.wireshark.org/review/6416
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/guid-utils.c')
| -rw-r--r-- | epan/guid-utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/guid-utils.c b/epan/guid-utils.c index 490ebd1a08..66020afd4d 100644 --- a/epan/guid-utils.c +++ b/epan/guid-utils.c @@ -51,8 +51,8 @@ ResolveWin32UUID(e_guid_t if_id, char *uuid_name, int uuid_name_max_len) DWORD uuid_max_size = MAX_PATH; TCHAR *reg_uuid_str; - reg_uuid_name=ep_alloc(MAX_PATH*sizeof(TCHAR)); - reg_uuid_str=ep_alloc(MAX_PATH*sizeof(TCHAR)); + reg_uuid_name=wmem_alloc(wmem_packet_scope(), MAX_PATH*sizeof(TCHAR)); + reg_uuid_str=wmem_alloc(wmem_packet_scope(), MAX_PATH*sizeof(TCHAR)); if(uuid_name_max_len < 2){ return 0; @@ -159,7 +159,7 @@ guids_get_guid_name(const e_guid_t *guid) #ifdef _WIN32 /* try to resolve the mapping from the Windows registry */ /* XXX - prefill the resolving database with all the Windows registry entries once at init only (instead of searching each time)? */ - uuid_name=ep_alloc(128); + uuid_name=wmem_alloc(wmem_packet_scope(), 128); if(ResolveWin32UUID(*guid, uuid_name, 128)) { return uuid_name; } @@ -191,7 +191,7 @@ guids_resolve_guid_to_str(const e_guid_t *guid) return name; } - return ep_strdup_printf("%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + return wmem_strdup_printf(wmem_packet_scope(), "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", guid->data1, guid->data2, guid->data3, guid->data4[0], guid->data4[1], guid->data4[2], guid->data4[3], |