From 2a25cee78ab1d37e7d2bc40ae675646974d99f56 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Wed, 15 Jul 2015 19:21:26 +0000
Subject: MFC r280849,280915-280916,281015-281016,282097,282408,282415,283542, 
     284864,285169-285170,285435:

ntp 4.2.8p3.

Relnotes:	yes
Approved by:	re (?)
---
 contrib/ntp/include/ntp_debug.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'contrib/ntp/include/ntp_debug.h')

diff --git a/contrib/ntp/include/ntp_debug.h b/contrib/ntp/include/ntp_debug.h
index 55b2e1a..b0e846e 100644
--- a/contrib/ntp/include/ntp_debug.h
+++ b/contrib/ntp/include/ntp_debug.h
@@ -9,20 +9,19 @@
 #define NTP_DEBUG_H
 
 /*
- * macros for debugging output - cut down on #ifdef pollution in the code
+ * macro for debugging output - cut down on #ifdef pollution.
+ *
+ * TRACE() is similar to ntpd's DPRINTF() for utilities and libntp.
+ * Uses mprintf() and so supports %m, replaced by strerror(errno).
+ *
+ * The calling convention is not attractive:
+ *     TRACE(debuglevel, (fmt, ...));
+ *     TRACE(2, ("this will appear on stdout if debug >= %d\n", 2));
  */
-
-#ifdef DEBUG
-#define DPRINTF(_lvl_, _arg_)				\
+#define TRACE(lvl, arg)					\
 	do { 						\
-		if (debug >= (_lvl_))			\
-			printf _arg_;			\
+		if (debug >= (lvl))			\
+			mprintf arg;			\
 	} while (0)
-#else
-#define DPRINTF(_lvl_, _arg_)	do {} while (0)
-#endif
 
-#endif
-/*
- * $Log$
- */
+#endif	/* NTP_DEBUG_H */
-- 
cgit v1.1