Use <dprintf.h> instead of an ad hoc definition

Instead of using ad hoc definitions of dprintf, dprintf2, vdprintf and
vdprintf2, use <dprintf.h> everywhere possible.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c
index 4e5635f..e0974f9 100644 (file)
--- a/com32/lib/pci/scan.c
+++ b/com32/lib/pci/scan.c
@@ -41,12 +41,7 @@
 #include <stdbool.h>
 #include <ctype.h>
 #include <syslinux/zio.h>
-
-#ifdef DEBUG
-# define dprintf printf
-#else
-# define dprintf(...) ((void)0)
-#endif
+#include <dprintf.h>
 
 #define MAX_LINE 512
 

diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
index c1ce875..4b60a23 100644 (file)
--- a/com32/lib/syslinux/load_linux.c
+++ b/com32/lib/syslinux/load_linux.c
@@ -43,16 +43,7 @@
 #include <syslinux/linux.h>
 #include <syslinux/bootrm.h>
 #include <syslinux/movebits.h>
-
-#ifndef DEBUG
-# define DEBUG 0
-#endif
-#if DEBUG
-# include <stdio.h>
-# define dprintf printf
-#else
-# define dprintf(f, ...) ((void)0)
-#endif
+#include <dprintf.h>
 
 struct linux_header {
     uint8_t boot_sector_1[0x0020];

diff --git a/com32/lib/syslinux/movebits.c b/com32/lib/syslinux/movebits.c
index bd5ce0e..6c75105 100644 (file)
--- a/com32/lib/syslinux/movebits.c
+++ b/com32/lib/syslinux/movebits.c
@@ -48,21 +48,7 @@
 #include <stdbool.h>
 
 #include <syslinux/movebits.h>
-
-#ifndef DEBUG
-# ifdef TEST
-#  define DEBUG 1
-# else
-#  define DEBUG 0
-# endif
-#endif
-
-#if DEBUG
-# include <stdio.h>
-# define dprintf printf
-#else
-# define dprintf(...) ((void)0)
-#endif
+#include <dprintf.h>
 
 static jmp_buf new_movelist_bail;
 

diff --git a/com32/lib/syslinux/zonelist.c b/com32/lib/syslinux/zonelist.c
index b548211..915c7a8 100644 (file)
--- a/com32/lib/syslinux/zonelist.c
+++ b/com32/lib/syslinux/zonelist.c
@@ -39,21 +39,7 @@
 #include <stdlib.h>
 #include <syslinux/align.h>
 #include <syslinux/movebits.h>
-
-#ifndef DEBUG
-# ifdef TEST
-#  define DEBUG 1
-# else
-#  define DEBUG 0
-# endif
-#endif
-
-#if DEBUG
-# include <stdio.h>
-# define dprintf printf
-#else
-# define dprintf(...) ((void)0)
-#endif
+#include <dprintf.h>
 
 /*
  * Create an empty syslinux_memmap list.

diff --git a/com32/modules/ethersel.c b/com32/modules/ethersel.c
index 5c3cf02..28dc62c 100644 (file)
--- a/com32/modules/ethersel.c
+++ b/com32/modules/ethersel.c
@@ -38,12 +38,7 @@
 #include <com32.h>
 #include <syslinux/boot.h>
 #include <syslinux/config.h>
-
-#ifdef DEBUG
-# define dprintf printf
-#else
-# define dprintf(...) ((void)0)
-#endif
+#include <dprintf.h>
 
 #define MAX_LINE 512
 

diff --git a/com32/modules/pcitest.c b/com32/modules/pcitest.c
index 672023a..9921ee6 100644 (file)
--- a/com32/modules/pcitest.c
+++ b/com32/modules/pcitest.c
@@ -39,12 +39,7 @@
 #include <com32.h>
 #include <sys/pci.h>
 #include <stdbool.h>
-
-#ifdef DEBUG
-# define dprintf printf
-#else
-# define dprintf(...) ((void)0)
-#endif
+#include <dprintf.h>
 
 char display_line = 0;
 #define moreprintf(...)                                \