aboutsummaryrefslogtreecommitdiffstats
path: root/epan/osi-utils.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-07 20:25:29 -0500
committerAnders Broman <a.broman58@gmail.com>2015-01-08 07:24:15 +0000
commit20414ebf4b6851fbe578732fb3b8fb948b32e7c9 (patch)
treeb4fd8804d97254d1898d78a01229bbb2646b06cf /epan/osi-utils.c
parentcff098e3eb6a871a1e39559d27b33dc3a3437c2c (diff)
Replace some ep_alloc and ep_alloc0 with its wmem equivalent.
These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a Reviewed-on: https://code.wireshark.org/review/6392 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/osi-utils.c')
-rw-r--r--epan/osi-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index ba7d936468..fd79510107 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -44,7 +44,7 @@ print_nsap_net( const guint8 *ad, int length )
{
gchar *cur;
- cur = (gchar *)ep_alloc(MAX_NSAP_LEN * 3 + 50);
+ cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_NSAP_LEN * 3 + 50);
print_nsap_net_buf( ad, length, cur, MAX_NSAP_LEN * 3 + 50);
return( cur );
}
@@ -144,7 +144,7 @@ print_area(const guint8 *ad, int length)
{
gchar *cur;
- cur = (gchar *)ep_alloc(MAX_AREA_LEN * 3 + 20);
+ cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_AREA_LEN * 3 + 20);
print_area_buf(ad, length, cur, MAX_AREA_LEN * 3 + 20);
return cur;
}