X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=amandad-src%2Famandad.c;h=430f2b7f6a5a33990c396891725f6a1f8f171e92;hb=d92f70685083588e2a7ce6bc312a735f6937b5a6;hp=c5e057f716c77b32d92363babee3d91b75eed659;hpb=6c1f39091444e58c33362f0cc086375d9d273e77;p=debian%2Famanda

diff --git a/amandad-src/amandad.c b/amandad-src/amandad.c
index c5e057f..430f2b7 100644
--- 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,x) do {		\
+#define amandad_debug(i, ...) do {	\
 	if ((i) <= debug_amandad) {	\
-		dbprintf(x);		\
+		dbprintf(__VA_ARGS__);	\
 	}				\
 } while (0)
 
@@ -133,17 +133,6 @@ 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;