Move debug printing helpers to util header

2 files changed, 15 insertions, 14 deletions

diff --git a/noice.c b/noice.c
index 1e33dc8..5a38242 100644
--- a/noice.c
+++ b/noice.c
@@ -20,19 +20,6 @@
 
 #include "util.h"
 
-#ifdef DEBUG
-#define DEBUG_FD 8
-#define DPRINTF_D(x) dprintf(DEBUG_FD, #x "=%d\n", x)
-#define DPRINTF_U(x) dprintf(DEBUG_FD, #x "=%u\n", x)
-#define DPRINTF_S(x) dprintf(DEBUG_FD, #x "=%s\n", x)
-#define DPRINTF_P(x) dprintf(DEBUG_FD, #x "=0x%p\n", x)
-#else
-#define DPRINTF_D(x)
-#define DPRINTF_U(x)
-#define DPRINTF_S(x)
-#define DPRINTF_P(x)
-#endif /* DEBUG */
-
 #define NR_ARGS	32
 #define LEN(x) (sizeof(x) / sizeof(*(x)))
 #undef MIN
@@ -117,7 +104,6 @@ void printmsg(char *);
 void printwarn(void);
 void printerr(int, char *);
 
-#undef dprintf
 int
 dprintf(int fd, const char *fmt, ...)
 {
diff --git a/util.h b/util.h
index c4d1904..22b7f30 100644
--- a/util.h
+++ b/util.h
@@ -3,3 +3,18 @@
 size_t strlcat(char *, const char *, size_t);
 #undef strlcpy
 size_t strlcpy(char *, const char *, size_t);
+#undef dprintf
+int dprintf(int, const char *, ...);
+
+#ifdef DEBUG
+#define DEBUG_FD 8
+#define DPRINTF_D(x) dprintf(DEBUG_FD, #x "=%d\n", x)
+#define DPRINTF_U(x) dprintf(DEBUG_FD, #x "=%u\n", x)
+#define DPRINTF_S(x) dprintf(DEBUG_FD, #x "=%s\n", x)
+#define DPRINTF_P(x) dprintf(DEBUG_FD, #x "=0x%p\n", x)
+#else
+#define DPRINTF_D(x)
+#define DPRINTF_U(x)
+#define DPRINTF_S(x)
+#define DPRINTF_P(x)
+#endif /* DEBUG */