[PATCH] udev - safer string handling - part four

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index 3ee3e1acf05967a03540dbe07ca5e9089e29c0ce..1c27917f61e4ed89ecc6e8b6b3a28f615c51d853 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -31,19 +31,20 @@
 
 #ifdef LOG
 #include <stdarg.h>
+#include <unistd.h>
 #include <syslog.h>
 
 #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
 
@@ -52,22 +53,14 @@
 #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
 
-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;
-
-       va_start(args, format);
-       vsyslog(level, format, args);
-       va_end(args);
-}
 
-/* each program must declare this variable somewhere */
+/* each program that uses syslog must declare this variable somewhere */
 extern unsigned char logname[42];
 
 #undef init_logging