Add ws_debug() and use it

Replace most instances of ws_debug_printf() except in
epan/dissectors and dissector plugins.

Some replacements use printf(), some use ws_debug(), and
some were removed because they were dead or judged to be
temporary.

8 files changed, 8 insertions, 8 deletions

diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 14b531b477..f35097a0ba 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -24,7 +24,7 @@
 #include <epan/expert.h>
 #include <epan/proto_data.h>
 #if defined(DEBUG_BEEP_HASH)
-#include <wsutil/ws_printf.h> /* ws_debug_printf */
+#include <epan/ws_printf.h>
 #endif
 
 #define TCP_PORT_BEEP 10288 /* Don't think this is IANA registered */
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 07c2b4b7bf..893e60a869 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -56,7 +56,7 @@
 #include <epan/decode_as.h>
 #include <wiretap/wtap.h>
 #ifdef DEBUG_BER
-#include <wsutil/ws_printf.h> /* ws_debug_printf */
+#include <epan/ws_printf.h>
 #endif
 
 #include "packet-ber.h"
diff --git a/epan/dissectors/packet-epl-profile-parser.c b/epan/dissectors/packet-epl-profile-parser.c
index 06e34858e4..108516aba0 100644
--- a/epan/dissectors/packet-epl-profile-parser.c
+++ b/epan/dissectors/packet-epl-profile-parser.c
@@ -21,7 +21,7 @@
 #include "packet-epl.h"
 #include "ws_attributes.h"
 
-#include <wsutil/ws_printf.h>
+#include <epan/ws_printf.h>
 #include <epan/range.h>
 
 #include <string.h>
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 65f93c7067..86c371bb29 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -282,7 +282,7 @@
 #include <wsutil/str_util.h>
 #include <wsutil/pint.h>
 #include <wsutil/report_message.h>
-#include <wsutil/ws_printf.h> /* ws_debug_printf */
+#include <epan/ws_printf.h>
 
 #include "packet-giop.h"
 #include "packet-ziop.h"
diff --git a/epan/dissectors/packet-protobuf.c b/epan/dissectors/packet-protobuf.c
index 457e2f6ff8..4b75287fce 100644
--- a/epan/dissectors/packet-protobuf.c
+++ b/epan/dissectors/packet-protobuf.c
@@ -39,7 +39,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/pint.h>
-#include <wsutil/ws_printf.h>
+#include <epan/ws_printf.h>
 #include <wsutil/report_message.h>
 
 #include "protobuf-helper.h"
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index fdd6e98c13..b3b7e15d52 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -27,7 +27,7 @@
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
 #include <wsutil/wsgcrypt.h>
-#include <wsutil/ws_printf.h> /* ws_debug_printf */
+#include <epan/ws_printf.h>
 
 #include "packet-tcp.h"
 #include "packet-tacacs.h"
diff --git a/epan/dissectors/packet-tibia.c b/epan/dissectors/packet-tibia.c
index ad2d9aaa71..1dc192850c 100644
--- a/epan/dissectors/packet-tibia.c
+++ b/epan/dissectors/packet-tibia.c
@@ -104,7 +104,7 @@
 #include <wsutil/strtoi.h>
 #include <wsutil/rsa.h>
 #include <errno.h>
-#include <wsutil/ws_printf.h>
+#include <epan/ws_printf.h>
 #include <epan/ptvcursor.h>
 
 void proto_register_tibia(void);
diff --git a/epan/dissectors/packet-vpp.c b/epan/dissectors/packet-vpp.c
index 1d512ef3c5..51f3644028 100644
--- a/epan/dissectors/packet-vpp.c
+++ b/epan/dissectors/packet-vpp.c
@@ -20,7 +20,7 @@
 #include <epan/nlpid.h>
 #include <epan/etypes.h>
 #include <stdio.h>
-#include <wsutil/ws_printf.h>
+#include <epan/ws_printf.h>
 
 void proto_register_vpp(void);
 void proto_reg_handoff_vpp(void);