[PATCH] raid-devfs.sh: devfs names for hardware RAID controllers

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index 30f52c84ce6969eda5b0fb54c1a2c4151389c802..4f51217b9ac730d68fc3c00c4d4e5d2cc6bf1067 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -35,18 +35,16 @@
 #include <unistd.h>
 #include <syslog.h>
 
-#define LOGNAME_SIZE                   42
-
 #undef info
-#define info(format, arg...)                                                           \
-       do {                                                                            \
-               log_message(LOG_INFO , format , ## arg);                                \
+#define info(format, arg...)                                                   \
+       do {                                                                    \
+               log_message(LOG_INFO , format , ## arg);                        \
        } while (0)
 
 #ifdef DEBUG
 #undef dbg
-#define dbg(format, arg...)                                                            \
-       do {                                                                            \
+#define dbg(format, arg...)                                                    \
+       do {                                                                    \
                log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
        } while (0)
 #endif
@@ -54,8 +52,8 @@
 /* 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 {                                                                            \
+#define dbg_parse(format, arg...)                                              \
+       do {                                                                    \
                log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
        } while (0)
 #endif
@@ -63,14 +61,10 @@
 extern void log_message(int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
-/* each program that uses syslog must declare this variable somewhere */
-extern unsigned char logname[LOGNAME_SIZE];
-
 #undef logging_init
-static inline void logging_init(char *program_name)
+static inline void logging_init(const char *program_name)
 {
-       snprintf(logname, LOGNAME_SIZE,"%s[%d]", program_name, getpid());
-       openlog(logname, 0, LOG_DAEMON);
+       openlog(program_name, LOG_PID, LOG_DAEMON);
 }
 
 #undef logging_close