aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-noe.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-09-13 10:13:19 +0000
committerJörg Mayer <jmayer@loplof.de>2013-09-13 10:13:19 +0000
commit23d3e3d665ce2826477bf04ceabe961330cfcd5a (patch)
tree5ba7e0d34e5a234c811a34fdd9e4ba2b52dd1848 /epan/dissectors/packet-noe.c
parent1e762e315dcb07f8d78d7aabc20f5065a8ed43f0 (diff)
Dario Lombardo <lomato@gmail.com> via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 Migration from emem to wmem for trivial cases (ep_alloc only). svn path=/trunk/; revision=52002
Diffstat (limited to 'epan/dissectors/packet-noe.c')
-rw-r--r--epan/dissectors/packet-noe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c
index 885655530e..a8cf3257bc 100644
--- a/epan/dissectors/packet-noe.c
+++ b/epan/dissectors/packet-noe.c
@@ -28,6 +28,7 @@
#include <glib.h>
#include "epan/packet.h"
+#include <epan/wmem/wmem.h>
#define OPCODE_C_context 0
#define OPCODE_C_terminal 1
@@ -856,7 +857,7 @@ static char *decode_key_name(int unicode)
{
char *key_name;
- key_name = (char *)ep_alloc(10);
+ key_name = (char *)wmem_alloc(wmem_packet_scope(), 10);
if ((unicode <= 0x20)
|| (unicode == 0x7F)
@@ -1115,7 +1116,7 @@ static void decode_evt(proto_tree *tree,
pt_length -= 1;
}
unicode_value = decode_utf8(utf8_value);
- key_name = (char *)ep_alloc(30);
+ key_name = (char *)wmem_alloc(wmem_packet_scope(), 30);
g_snprintf(key_name, 30, "\"%s\"", decode_key_name((int)unicode_value));
/* add text to the frame "INFO" column */