Convert the obvious emem to wmem in lua code.

Bug:9927
Change-Id: Ibf0dd45d3b54e489b70a4fde193b825ec703379e
Reviewed-on: https://code.wireshark.org/review/2349
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 15 insertions, 8 deletions

diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c
index 7afec31ec0..4de04cf15e 100644
--- a/epan/wslua/wslua_dumper.c
+++ b/epan/wslua/wslua_dumper.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 /* WSLUA_MODULE Dumper Saving capture files
 
@@ -436,7 +436,7 @@ WSLUA_METHOD Dumper_dump_current(lua_State* L) {
     pkthdr.pseudo_header = *lua_pinfo->pseudo_header;
 
     if (lua_pinfo->pkt_comment)
-        pkthdr.opt_comment = ep_strdup(lua_pinfo->pkt_comment);
+        pkthdr.opt_comment = wmem_strdup(wmem_packet_scope(), lua_pinfo->pkt_comment);
 
     data = (const guchar *)tvb_memdup(wmem_packet_scope(),tvb,0,pkthdr.caplen);
 
diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c
index b10e1e1312..0060a667bb 100644
--- a/epan/wslua/wslua_gui.c
+++ b/epan/wslua/wslua_gui.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 #include "wslua.h"
 
@@ -371,8 +371,11 @@ WSLUA_METHOD ProgDlg_close(lua_State* L) { /* Closes the progress dialog. */
 
 static int ProgDlg__tostring(lua_State* L) {
     ProgDlg pd = checkProgDlg(L,1);
+    char *str;
 
-    lua_pushstring(L,ep_strdup_printf("%sstopped",pd->stopped?"":"not "));
+    str = wmem_strdup_printf(NULL, "%sstopped",pd->stopped?"":"not ");
+    lua_pushstring(L, str);
+    wmem_free(NULL, str);
 
     return 0;
 }
diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index b508010ea8..0fdd16f701 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 /* WSLUA_MODULE Pinfo Obtaining packet information */
 
@@ -98,8 +98,11 @@ WSLUA_METAMETHOD NSTime__call(lua_State* L) { /* Creates a NSTime object. */
 
 WSLUA_METAMETHOD NSTime__tostring(lua_State* L) {
     NSTime nstime = checkNSTime(L,1);
+    gchar *str;
 
-    lua_pushstring(L,ep_strdup_printf("%ld.%09d", (long)nstime->secs, nstime->nsecs));
+    str = wmem_strdup_printf(NULL, "%ld.%09d", (long)nstime->secs, nstime->nsecs);
+    lua_pushstring(L, str);
+    wmem_free(NULL, str);
 
     WSLUA_RETURN(1); /* The string representing the nstime. */
 }
diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c
index d40de58436..b78814c441 100644
--- a/epan/wslua/wslua_tvb.c
+++ b/epan/wslua/wslua_tvb.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 
 /* WSLUA_MODULE Tvb Functions for handling packet data */
 
@@ -510,8 +510,9 @@ WSLUA_METAMETHOD Tvb__tostring(lua_State* L) {
     gchar* str;
 
     len = tvb_length(tvb->ws_tvb);
-    str = ep_strdup_printf("TVB(%i) : %s",len,tvb_bytes_to_ep_str(tvb->ws_tvb,0,len));
+    str = wmem_strdup_printf(NULL, "TVB(%i) : %s",len,tvb_bytes_to_ep_str(tvb->ws_tvb,0,len));
     lua_pushstring(L,str);
+    wmem_free(NULL, str);
     WSLUA_RETURN(1); /* The string. */
 }