diff options
| author | Hadriel Kaplan <hadriel@128technology.com> | 2014-12-29 00:21:15 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-04 21:02:38 +0000 |
| commit | fac8356610fadf488ff92c5a22e5177bb33a2511 (patch) | |
| tree | af8a1ceec7eb91c5a6a5e6e2ac14621425125e65 /epan/wslua/wslua_tree.c | |
| parent | 5653fcedca8491829d6d6ce480e7fba13ff801d7 (diff) | |
Make all Lua code use wmem not emem
Changed all remaining code in wslua that was using emem, to use wmem or
simpler methods.
Bug: 9927
Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55
Reviewed-on: https://code.wireshark.org/review/6109
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/wslua/wslua_tree.c')
| -rw-r--r-- | epan/wslua/wslua_tree.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c index 5d8aac895b..6958d3e21e 100644 --- a/epan/wslua/wslua_tree.c +++ b/epan/wslua/wslua_tree.c @@ -27,8 +27,6 @@ #include "config.h" -#include <epan/emem.h> - /* WSLUA_MODULE Tree Adding information to the dissection tree */ #include "wslua.h" @@ -201,8 +199,8 @@ WSLUA_METHOD TreeItem_add_packet_field(lua_State *L) { tvbr = shiftTvbRange(L,1); if (!tvbr) { /* No TvbRange specified */ - tvbr = ep_new(struct _wslua_tvbrange); - tvbr->tvb = ep_new(struct _wslua_tvb); + tvbr = wmem_new(wmem_packet_scope(), struct _wslua_tvbrange); + tvbr->tvb = wmem_new(wmem_packet_scope(), struct _wslua_tvb); tvbr->tvb->ws_tvb = lua_tvb; tvbr->offset = 0; tvbr->len = 0; @@ -302,8 +300,8 @@ static int TreeItem_add_item_any(lua_State *L, gboolean little_endian) { tvbr = shiftTvbRange(L,1); if (!tvbr) { - tvbr = ep_new(struct _wslua_tvbrange); - tvbr->tvb = ep_new(struct _wslua_tvb); + tvbr = wmem_new(wmem_packet_scope(), struct _wslua_tvbrange); + tvbr->tvb = wmem_new(wmem_packet_scope(), struct _wslua_tvb); tvbr->tvb->ws_tvb = lua_tvb; tvbr->offset = 0; tvbr->len = 0; @@ -608,10 +606,10 @@ WSLUA_METHOD TreeItem_add_tvb_expert_info(lua_State *L) { tvbr = shiftTvbRange(L,WSLUA_ARG_TreeItem_add_tvb_expert_info_TVB); if (!tvbr) { - tvbr = ep_new(struct _wslua_tvbrange); + tvbr = wmem_new(wmem_packet_scope(), struct _wslua_tvbrange); tvbr->tvb = shiftTvb(L,WSLUA_ARG_TreeItem_add_tvb_expert_info_TVB); if (!tvbr->tvb) { - tvbr->tvb = ep_new(struct _wslua_tvb); + tvbr->tvb = wmem_new(wmem_packet_scope(), struct _wslua_tvb); } tvbr->tvb->ws_tvb = lua_tvb; tvbr->offset = 0; |