diff options
| -rw-r--r-- | logging.h | 24 | ||||
| -rw-r--r-- | udev.c | 1 | ||||
| -rw-r--r-- | udevd.c | 1 | ||||
| -rw-r--r-- | udevinfo.c | 1 | ||||
| -rw-r--r-- | udevsend.c | 1 | ||||
| -rw-r--r-- | udevtest.c | 1 |
6 files changed, 9 insertions, 20 deletions
@@ -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 @@ -41,7 +41,6 @@ #ifdef LOG -unsigned char logname[LOGNAME_SIZE]; void log_message(int level, const char *format, ...) { va_list args; @@ -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 116aedbc21..00af081eac 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 16174f5e46..74cc09b330 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 388818d495..4b94442608 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; |