From aa1bc012c87041966cfc17b44674e3c7eb3a2250 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 13 Jan 2017 11:01:12 +0100 Subject: logging: remove code duplication * make DEBUGP* macro into simple wrappers around LOGP* * deprecate unused logp() function Related: OS#71 Change-Id: Ia6c92bd4824c44fc22cc733ce7a88da86e58ed93 --- include/osmocom/core/logging.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index fe9ae93f..fcf77f0e 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -10,6 +10,7 @@ #include #include #include +#include #include /*! \brief Maximum number of logging contexts */ @@ -25,18 +26,8 @@ * \param[in] fmt format string * \param[in] args variable argument list */ -#define DEBUGP(ss, fmt, args...) \ - do { \ - if (log_check_level(ss, LOGL_DEBUG)) \ - logp(ss, __BASE_FILE__, __LINE__, 0, fmt, ## args); \ - } while(0) - -#define DEBUGPC(ss, fmt, args...) \ - do { \ - if (log_check_level(ss, LOGL_DEBUG)) \ - logp(ss, __BASE_FILE__, __LINE__, 1, fmt, ## args); \ - } while(0) - +#define DEBUGP(ss, fmt, args...) LOGP(ss, LOGL_DEBUG, fmt, ##args) +#define DEBUGPC(ss, fmt, args...) LOGPC(ss, LOGL_DEBUG, fmt, ##args) #else #define DEBUGP(xss, fmt, args...) #define DEBUGPC(ss, fmt, args...) @@ -46,7 +37,7 @@ void osmo_vlogp(int subsys, int level, const char *file, int line, int cont, const char *format, va_list ap); -void logp(int subsys, const char *file, int line, int cont, const char *format, ...) __attribute__ ((format (printf, 5, 6))); +void logp(int subsys, const char *file, int line, int cont, const char *format, ...) OSMO_DEPRECATED("Use DEBUGP* macros instead"); /*! \brief Log a new message through the Osmocom logging framework * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL) -- cgit v1.2.3