chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] rename device_list->list to device_list->node
[elogind.git]
/
logging.h
diff --git
a/logging.h
b/logging.h
index 30f52c84ce6969eda5b0fb54c1a2c4151389c802..3ff54ec9747648f36f8ee2412ed39532fc62b6d4 100644
(file)
--- a/
logging.h
+++ b/
logging.h
@@
-30,23
+30,21
@@
#define logging_init(foo) do { } while (0)
#define logging_close(foo) do { } while (0)
#define logging_init(foo) do { } while (0)
#define logging_close(foo) do { } while (0)
-#ifdef LOG
+#ifdef
USE_
LOG
#include <stdarg.h>
#include <unistd.h>
#include <syslog.h>
#include <stdarg.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(c
onst c
har *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
@@
-79,6
+73,6
@@
static inline void logging_close(void)
closelog();
}
closelog();
}
-#endif /* LOG */
+#endif /*
USE_
LOG */
#endif
#endif