Remove checkAPI warnings from wmem.

printf and g_warning are not allowed in epan or its subdirectories

Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758
Reviewed-on: https://code.wireshark.org/review/16801
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 11 insertions, 9 deletions

diff --git a/epan/wmem/wmem_core.c b/epan/wmem/wmem_core.c
index f5d932e816..79f4b6b3ed 100644
--- a/epan/wmem/wmem_core.c
+++ b/epan/wmem/wmem_core.c
@@ -35,6 +35,8 @@
 #include "wmem_allocator_block_fast.h"
 #include "wmem_allocator_strict.h"
 
+#include <wsutil/ws_printf.h> /* ws_g_warning */
+
 /* Set according to the WIRESHARK_DEBUG_WMEM_OVERRIDE environment variable in
  * wmem_init. Should not be set again. */
 static gboolean do_override = FALSE;
@@ -208,7 +210,7 @@ wmem_init(void)
             override_type = WMEM_ALLOCATOR_BLOCK_FAST;
         }
         else {
-            g_warning("Unrecognized wmem override");
+            ws_g_warning("Unrecognized wmem override");
             do_override = FALSE;
         }
     }
diff --git a/epan/wmem/wmem_interval_tree.c b/epan/wmem/wmem_interval_tree.c
index d2300a4116..1d89a06539 100644
--- a/epan/wmem/wmem_interval_tree.c
+++ b/epan/wmem/wmem_interval_tree.c
@@ -33,7 +33,7 @@
 #include "wmem_strutl.h"
 #include "wmem_interval_tree.h"
 #include "wmem_user_cb.h"
-
+#include <wsutil/ws_printf.h> /* ws_debug_printf */
 
 
 static void
@@ -43,7 +43,7 @@ print_range(const void *value)
     if(!value) {
         return;
     }
-    printf("Range: low=%" G_GUINT64_FORMAT " high=%" G_GUINT64_FORMAT " max_edge=%" G_GUINT64_FORMAT "\n", range->low, range->high, range->max_edge);
+    ws_debug_printf("Range: low=%" G_GUINT64_FORMAT " high=%" G_GUINT64_FORMAT " max_edge=%" G_GUINT64_FORMAT "\n", range->low, range->high, range->max_edge);
 }
 
 /**
diff --git a/epan/wmem/wmem_tree.c b/epan/wmem/wmem_tree.c
index 8332c45a48..c4641279b1 100644
--- a/epan/wmem/wmem_tree.c
+++ b/epan/wmem/wmem_tree.c
@@ -33,7 +33,7 @@
 #include "wmem_tree.h"
 #include "wmem_tree-int.h"
 #include "wmem_user_cb.h"
-
+#include <wsutil/ws_printf.h> /* ws_debug_printf */
 
 
 
@@ -706,7 +706,7 @@ static void
 wmem_print_indent(guint32 level) {
     guint32 i;
     for (i=0; i<level; i++) {
-        printf("    ");
+        ws_debug_printf("    ");
     }
 }
 
@@ -719,7 +719,7 @@ wmem_tree_print_nodes(const char *prefix, wmem_tree_node_t *node, guint32 level,
 
     wmem_print_indent(level);
 
-    printf("%sNODE:%p parent:%p left:%p right:%p colour:%s key:%p %s:%p\n",
+    ws_debug_printf("%sNODE:%p parent:%p left:%p right:%p colour:%s key:%p %s:%p\n",
             prefix,
             (void *)node, (void *)node->parent,
             (void *)node->left, (void *)node->right,
@@ -728,12 +728,12 @@ wmem_tree_print_nodes(const char *prefix, wmem_tree_node_t *node, guint32 level,
     if(key_printer) {
         wmem_print_indent(level);
         key_printer(node->key);
-        printf("\n");
+        ws_debug_printf("\n");
     }
     if(data_printer) {
         wmem_print_indent(level);
         data_printer(node->data);
-        printf("\n");
+        ws_debug_printf("\n");
     }
 
     if (node->left)
@@ -754,7 +754,7 @@ wmem_print_subtree(wmem_tree_t *tree, guint32 level, wmem_printer_func key_print
 
     wmem_print_indent(level);
 
-    printf("WMEM tree:%p root:%p\n", (void *)tree, (void *)tree->root);
+    ws_debug_printf("WMEM tree:%p root:%p\n", (void *)tree, (void *)tree->root);
     if (tree->root) {
         wmem_tree_print_nodes("Root-", tree->root, level, key_printer, data_printer);
     }