chiark / gitweb /
[PATCH] klibc supports LOG_PID now, so remove our own implementation
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>
Wed, 15 Dec 2004 10:27:10 +0000 (11:27 +0100)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 06:17:47 +0000 (23:17 -0700)
logging.h
udev.c
udevd.c
udevinfo.c
udevsend.c
udevtest.c

index 30f52c8..4f51217 100644 (file)
--- a/logging.h
+++ b/logging.h
 #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
 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
diff --git a/udev.c b/udev.c
index cf66e7c..0895e43 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -41,7 +41,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
 {
        va_list args;
diff --git a/udevd.c b/udevd.c
index 2e6f579..91189eb 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -64,7 +64,6 @@ static void reap_sigchilds(void);
 char *udev_bin;
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
index 116aedb..00af081 100644 (file)
@@ -39,7 +39,6 @@
 #define SYSFS_VALUE_SIZE               256
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
index 16174f5..74cc09b 100644 (file)
@@ -44,7 +44,6 @@
 static int sock = -1;
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;
index 388818d..4b94442 100644 (file)
@@ -37,7 +37,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
        va_list args;