Merge branch 'upstream'

[debian/amanda] / amandad-src / amandad.c

diff --git a/amandad-src/amandad.c b/amandad-src/amandad.c
index 430f2b7f6a5a33990c396891725f6a1f8f171e92..c5e057f716c77b32d92363babee3d91b75eed659 100644 (file)
--- a/amandad-src/amandad.c
+++ b/amandad-src/amandad.c
@@ -48,9 +48,9 @@
 #define        REP_TIMEOUT     (6*60*60)       /* secs for service to reply */
 #define        ACK_TIMEOUT     10              /* XXX should be configurable */
 
-#define amandad_debug(i, ...) do {     \
+#define amandad_debug(i,x) do {                \
        if ((i) <= debug_amandad) {     \
-               dbprintf(__VA_ARGS__);  \
+               dbprintf(x);            \
        }                               \
 } while (0)
 
@@ -133,6 +133,17 @@ static struct {
     TAILQ_HEAD_INITIALIZER(serviceq.tailq), 0
 };
 
+/*
+ * Data for dbmalloc to check for memory leaks
+ */
+#ifdef USE_DBMALLOC
+static struct {
+    struct {
+       unsigned long size, hist;
+    } start, end;
+} dbmalloc_info;
+#endif
+
 static int wait_30s = 1;
 static int exit_on_qlength = 1;
 static char *auth = NULL;