slirp: Cleanup and basic reanimation of debug code

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

6 files changed, 19 insertions, 29 deletions

diff --git a/bootp.c b/bootp.c
index 06912e5..4c9e944 100644
--- a/bootp.c
+++ b/bootp.c
@@ -41,11 +41,13 @@ char *bootp_filename;
 static const uint8_t rfc1533_cookie[] = { RFC1533_COOKIE };
 
 #ifdef DEBUG
-#define dprintf(fmt, ...)                 \
-    if (slirp_debug & DBG_CALL) {         \
-        fprintf(dfd, fmt, ##__VA_ARGS__); \
-        fflush(dfd);                      \
-    }
+#define dprintf(fmt, ...)                     \
+    do                                        \
+        if (slirp_debug & DBG_CALL) {         \
+            fprintf(dfd, fmt, ##__VA_ARGS__); \
+            fflush(dfd);                      \
+        }                                     \
+    while (0)
 #else
 #define dprintf(fmt, ...)
 #endif
diff --git a/debug.c b/debug.c
deleted file mode 100644
index ad02df7..0000000
--- a/debug.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 1995 Danny Gasparovski.
- * Portions copyright (c) 2000 Kelly Price.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
- */
-
-#include <slirp.h>
-
-FILE *dfd = NULL;
-int slirp_debug = 0;
diff --git a/debug.h b/debug.h
index 9a2391a..9a00dea 100644
--- a/debug.h
+++ b/debug.h
@@ -5,18 +5,18 @@
  * terms and conditions of the copyright.
  */
 
-#define PRN_STDERR 1
-#define PRN_SPRINTF 2
+//#define DEBUG 1
 
-extern FILE *dfd;
-extern int slirp_debug;
+#ifdef DEBUG
 
 #define DBG_CALL 0x1
 #define DBG_MISC 0x2
 #define DBG_ERROR 0x4
-#define DEBUG_DEFAULT DBG_CALL | DBG_MISC | DBG_ERROR
 
-#ifdef DEBUG
+#define dfd stderr
+
+extern int slirp_debug;
+
 #define DEBUG_CALL(x)               \
     if (slirp_debug & DBG_CALL) {   \
         fprintf(dfd, "%s...\n", x); \
@@ -45,7 +45,6 @@ extern int slirp_debug;
         fflush(dfd);               \
     }
 
-
 #else
 
 #define DEBUG_CALL(x)
@@ -55,5 +54,3 @@ extern int slirp_debug;
 #define DEBUG_ERROR(x)
 
 #endif
-
-void debug_init _P((char *, int));
diff --git a/misc.c b/misc.c
index 35f584f..48b60ee 100644
--- a/misc.c
+++ b/misc.c
@@ -10,6 +10,10 @@
 
 #include "monitor.h"
 
+#ifdef DEBUG
+int slirp_debug = DBG_CALL | DBG_MISC | DBG_ERROR;
+#endif
+
 u_int curtime, time_fasttimo, last_slowtimo;
 
 /*
diff --git a/slirp.h b/slirp.h
index 7fca2b3..2c21c62 100644
--- a/slirp.h
+++ b/slirp.h
@@ -1,8 +1,6 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-//#define DEBUG 1
-
 #include "config-host.h"
 #include "slirp_config.h"
 
diff --git a/socket.c b/socket.c
index 1bcb3a7..62cebf7 100644
--- a/socket.c
+++ b/socket.c
@@ -591,7 +591,8 @@ struct socket *tcp_listen(u_int32_t haddr, u_int hport, u_int32_t laddr,
     socklen_t addrlen = sizeof(addr);
 
     DEBUG_CALL("tcp_listen");
-    DEBUG_ARG("port = %d", port);
+    DEBUG_ARG("haddr = %x", haddr);
+    DEBUG_ARG("hport = %d", hport);
     DEBUG_ARG("laddr = %x", laddr);
     DEBUG_ARG("lport = %d", lport);
     DEBUG_ARG("flags = %x", flags);