print useconds in udevmonitor

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index 5ae228b139fa778379ac0e03011b44adfd1bd60c..dd520dd874908d39bd6771bc71437b06b65d7778 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -24,66 +24,52 @@
 #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 init_logging(foo)              do { } while (0)
+#define logging_init(foo)              do { } while (0)
+#define logging_close(foo)             do { } while (0)
 
-#ifdef LOG
+#ifdef USE_LOG
 #include <stdarg.h>
 #include <unistd.h>
 #include <syslog.h>
 
-#include "udev.h"
-#include "udev_version.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);                               \
+#define info(format, arg...)                                                   \
+       do {                                                                    \
+               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);        \
+#define dbg(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_DEBUG ,"%s: " format ,__FUNCTION__ ,## arg);    \
        } while (0)
 #endif
 
-static void log_message (int level, const char *format, ...)
+extern void log_message(int priority, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
-static inline void log_message (int level, const char *format, ...)
-{
-       va_list args;
-
-       if (0 != strncmp(udev_log_str, UDEV_LOG_DEFAULT, BOOL_SIZE))
-               return;
 
-       va_start(args, format);
-       vsyslog(level, format, args);
-       va_end(args);
+#undef logging_init
+static inline void logging_init(const char *program_name)
+{
+       openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON);
 }
 
-/* each program must declare this variable somewhere */
-extern unsigned char logname[42];
-
-#undef init_logging
-static inline void init_logging(char *program_name)
+#undef logging_close
+static inline void logging_close(void)
 {
-       snprintf(logname, 42,"%s[%d]", program_name, getpid());
-       openlog(logname, 0, LOG_DAEMON);
+       closelog();
 }
 
-#endif /* LOG */
+#endif /* USE_LOG */
 
 #endif