chiark / gitweb /
remove no longer needed includes
[elogind.git] / logging.h
index 3ff54ec..e0dcb80 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -24,9 +24,9 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 
+#define err(format, arg...)            do { } while (0)
 #define info(format, arg...)           do { } while (0)
 #define dbg(format, arg...)            do { } while (0)
-#define dbg_parse(format, arg...)      do { } while (0)
 #define logging_init(foo)              do { } while (0)
 #define logging_close(foo)             do { } while (0)
 
 #include <unistd.h>
 #include <syslog.h>
 
+#undef err
+#define err(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg);              \
+       } while (0)
+
 #undef info
 #define info(format, arg...)                                                   \
        do {                                                                    \
-               log_message(LOG_INFO , format , ## arg);                        \
+               log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg);             \
        } while (0)
 
 #ifdef DEBUG
 #undef dbg
 #define dbg(format, arg...)                                                    \
        do {                                                                    \
-               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
-       } while (0)
-#endif
-
-/* Parser needs it's own debugging statement, we usually don't care about this at all */
-#ifdef DEBUG_PARSER
-#undef dbg_parse
-#define dbg_parse(format, arg...)                                              \
-       do {                                                                    \
-               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
+               log_message(LOG_DEBUG ,"%s: " format ,__FUNCTION__ ,## arg);    \
        } while (0)
 #endif
 
-extern void log_message(int level, const char *format, ...)
+extern void log_message(int priority, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
 #undef logging_init