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

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>
 
 #include <unistd.h>
 #include <syslog.h>
 

-#define LOGNAME_SIZE                   42
-

 #undef info
 #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
        } 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
                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
 /* 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
                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)));
 
 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
 #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
 }
 
 #undef logging_close

diff --git a/udev.c b/udev.c
index cf66e7cc89d9fed2a903a9d4f7556e3a301700fe..0895e437ba76d6077c30ab5d685c7fca1be8bef7 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -41,7 +41,6 @@
 
 
 #ifdef LOG
 
 
 #ifdef LOG

-unsigned char logname[LOGNAME_SIZE];

 void log_message(int level, const char *format, ...)
 {
        va_list args;
 void log_message(int level, const char *format, ...)
 {
        va_list args;

diff --git a/udevd.c b/udevd.c
index 2e6f5793d3747ea57447e966bf8e91c18e70644d..91189eb86153fc52046b104ff4d2523179fe2d1e 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -64,7 +64,6 @@ static void reap_sigchilds(void);
 char *udev_bin;
 
 #ifdef LOG
 char *udev_bin;
 
 #ifdef LOG

-unsigned char logname[LOGNAME_SIZE];

 void log_message (int level, const char *format, ...)
 {
        va_list args;
 void log_message (int level, const char *format, ...)
 {
        va_list args;

diff --git a/udevinfo.c b/udevinfo.c
index 116aedbc21ea06258c60a6a559990b547ad0ef47..00af081eacfc1fccde721cb711aef27e3c6011c0 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -39,7 +39,6 @@
 #define SYSFS_VALUE_SIZE               256
 
 #ifdef LOG
 #define SYSFS_VALUE_SIZE               256
 
 #ifdef LOG

-unsigned char logname[LOGNAME_SIZE];

 void log_message (int level, const char *format, ...)
 {
        va_list args;
 void log_message (int level, const char *format, ...)
 {
        va_list args;

diff --git a/udevsend.c b/udevsend.c
index 16174f5e466c5674079452e3dc72dddb50613550..74cc09b3300869f5af734c4075eb265262f55aa8 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -44,7 +44,6 @@
 static int sock = -1;
 
 #ifdef LOG
 static int sock = -1;
 
 #ifdef LOG

-unsigned char logname[LOGNAME_SIZE];

 void log_message (int level, const char *format, ...)
 {
        va_list args;
 void log_message (int level, const char *format, ...)
 {
        va_list args;

diff --git a/udevtest.c b/udevtest.c
index 388818d495ce25a7cf5635d71cc7d4ef6bd3e481..4b94442608641b677e07beebf5a878dcdbf55308 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -37,7 +37,6 @@
 
 
 #ifdef LOG
 
 
 #ifdef LOG

-unsigned char logname[LOGNAME_SIZE];

 void log_message (int level, const char *format, ...)
 {
        va_list args;
 void log_message (int level, const char *format, ...)
 {
        va_list args;