aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wslua/wslua_gui.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-09-18 10:09:31 -0700
committerPeter Wu <peter@lekensteyn.nl>2018-09-19 16:07:03 +0000
commit8f08a4e74ea8aa56284e6035017adf1c423c4f09 (patch)
tree030955437d3e8b2a2b5ebdcb3e0f9ba77ab42ef9 /epan/wslua/wslua_gui.c
parentca8304249ee986f947b30eaea1d830207165c65e (diff)
Try to discourage the use of APIs via counting.
Add the ability to specify maximum function counts for each group to checkAPIs. Add maximum counts for the "termoutput" and "abort" groups where needed. Show summaries in various checkAPI targets. Switch uses of ws_g_warning back to plain g_warning. Change-Id: I5cbddc8c671729e424eed8551f69116d16491976 Reviewed-on: https://code.wireshark.org/review/29721 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/wslua/wslua_gui.c')
-rw-r--r--epan/wslua/wslua_gui.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c
index e93618ff92..eec71fa5f2 100644
--- a/epan/wslua/wslua_gui.c
+++ b/epan/wslua/wslua_gui.c
@@ -13,7 +13,6 @@
#include "config.h"
#include <epan/wmem/wmem.h>
-#include <wsutil/ws_printf.h> /* ws_g_warning */
#include "wslua.h"
@@ -49,10 +48,10 @@ static void lua_menu_callback(gpointer data) {
case 0:
break;
case LUA_ERRRUN:
- ws_g_warning("Runtime error while calling menu callback");
+ g_warning("Runtime error while calling menu callback");
break;
case LUA_ERRMEM:
- ws_g_warning("Memory alloc error while calling menu callback");
+ g_warning("Memory alloc error while calling menu callback");
break;
default:
g_assert_not_reached();
@@ -146,10 +145,10 @@ static void lua_dialog_cb(gchar** user_input, void* data) {
case 0:
break;
case LUA_ERRRUN:
- ws_g_warning("Runtime error while calling dialog callback");
+ g_warning("Runtime error while calling dialog callback");
break;
case LUA_ERRMEM:
- ws_g_warning("Memory alloc error while calling dialog callback");
+ g_warning("Memory alloc error while calling dialog callback");
break;
default:
g_assert_not_reached();
@@ -185,10 +184,10 @@ static void text_win_close_cb(void* data) {
case 0:
break;
case LUA_ERRRUN:
- ws_g_warning("Runtime error during execution of TextWindow close callback");
+ g_warning("Runtime error during execution of TextWindow close callback");
break;
case LUA_ERRMEM:
- ws_g_warning("Memory alloc error during execution of TextWindow close callback");
+ g_warning("Memory alloc error during execution of TextWindow close callback");
break;
default:
break;
@@ -614,10 +613,10 @@ static gboolean wslua_button_callback(funnel_text_window_t* ws_tw, void* data) {
case 0:
break;
case LUA_ERRRUN:
- ws_g_warning("Runtime error while calling button callback");
+ g_warning("Runtime error while calling button callback");
break;
case LUA_ERRMEM:
- ws_g_warning("Memory alloc error while calling button callback");
+ g_warning("Memory alloc error while calling button callback");
break;
default:
g_assert_not_reached();