From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Wed, 15 Dec 2004 10:27:10 +0000 (+0100)
Subject: [PATCH] klibc supports LOG_PID now, so remove our own implementation
X-Git-Tag: 050~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=82ca88904d1c9bf17f4434f54e12754c00eddcbd;hp=18ebc4305034401648e343b27981ef1badafef1c

[PATCH] klibc supports LOG_PID now, so remove our own implementation
---

diff --git a/logging.h b/logging.h
index 30f52c84c..4f51217b9 100644
--- 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
diff --git a/udev.c b/udev.c
index cf66e7cc8..0895e437b 100644
--- 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 2e6f5793d..91189eb86 100644
--- 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;
diff --git a/udevinfo.c b/udevinfo.c
index 116aedbc2..00af081ea 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -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;
diff --git a/udevsend.c b/udevsend.c
index 16174f5e4..74cc09b33 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -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;
diff --git a/udevtest.c b/udevtest.c
index 388818d49..4b9444260 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -37,7 +37,6 @@
 
 
 #ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
 void log_message (int level, const char *format, ...)
 {
 	va_list args;