shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 20:25:38 +03:00
Code

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

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2004-12-15 11:27:10 +01:00 committed by Greg KH
parent 18ebc43050
commit 82ca88904d
6 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
logging.h
View File

@ -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

1
udev.c
View File

@ -41,7 +41,6 @@
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
void log_message(int level, const char *format, ...)
{
va_list args;

1
udevd.c
View File

@ -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;

1
udevinfo.c
View 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;

1
udevsend.c
View 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;

1
udevtest.c
View File

@ -37,7 +37,6 @@
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
void log_message (int level, const char *format, ...)
{
va_list args;