[PATCH] remove udev_dbus.h from Makefile

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index df0d7dedcea1ceb1b72ccd9a74341de84815913e..40c342c3ab0c04c7b2690c1e34548f06c49ee0ee 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -34,17 +34,19 @@
 #include <unistd.h>
 #include <syslog.h>
 
+#define LOGNAME_SIZE                   42
+
 #undef info
 #define info(format, arg...)                                                           \
        do {                                                                            \
-               log_message (LOG_INFO , format , ## arg);                               \
+               log_message(LOG_INFO , format , ## arg);                                \
        } while (0)
 
 #ifdef DEBUG
 #undef dbg
 #define dbg(format, arg...)                                                            \
        do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
+               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
        } while (0)
 #endif
 
@@ -53,32 +55,20 @@
 #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
 
-/* each program must declare this variable and function somewhere */
-extern unsigned char logname[42];
-extern int log_ok(void);
-
-static void log_message (int level, const char *format, ...)
+extern void log_message(int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
-static inline void log_message (int level, const char *format, ...)
-{
-       va_list args;
 
-       if (!log_ok())
-               return;
-
-       va_start(args, format);
-       vsyslog(level, format, args);
-       va_end(args);
-}
+/* each program that uses syslog must declare this variable somewhere */
+extern unsigned char logname[LOGNAME_SIZE];
 
 #undef init_logging
 static inline void init_logging(char *program_name)
 {
-       snprintf(logname, 42,"%s[%d]", program_name, getpid());
+       snprintf(logname, LOGNAME_SIZE,"%s[%d]", program_name, getpid());
        openlog(logname, 0, LOG_DAEMON);
 }