aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tap.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/tap.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/tap.c')
-rw-r--r--epan/tap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/tap.c b/epan/tap.c
index ff51755067..5049d2ec3d 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -25,7 +25,6 @@
#include <epan/packet_info.h>
#include <epan/dfilter/dfilter.h>
#include <epan/tap.h>
-#include <wsutil/ws_printf.h> /* ws_g_warning */
static gboolean tapping_is_active=FALSE;
@@ -220,7 +219,7 @@ tap_queue_packet(int tap_id, packet_info *pinfo, const void *tap_specific_data)
* rather than having a fixed maximum number of entries?
*/
if(tap_packet_index >= TAP_PACKET_QUEUE_LEN){
- ws_g_warning("Too many taps queued");
+ g_warning("Too many taps queued");
return;
}
@@ -613,7 +612,7 @@ remove_tap_listener(void *tapdata)
}
if(!tl) {
- ws_g_warning("remove_tap_listener(): no listener found with that tap data");
+ g_warning("remove_tap_listener(): no listener found with that tap data");
return;
}
}