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] udev_volume_id: fix typo
[elogind.git]
/
logging.h
diff --git
a/logging.h
b/logging.h
index e233ddc88972b59ff6906fc4eded9a069bb02f65..4f51217b9ac730d68fc3c00c4d4e5d2cc6bf1067 100644
(file)
--- a/
logging.h
+++ b/
logging.h
@@
-27,52
+27,50
@@
#define info(format, arg...) do { } while (0)
#define dbg(format, arg...) do { } while (0)
#define dbg_parse(format, arg...) do { } while (0)
#define info(format, arg...) do { } while (0)
#define dbg(format, arg...) do { } while (0)
#define dbg_parse(format, arg...) do { } while (0)
+#define logging_init(foo) do { } while (0)
+#define logging_close(foo) do { } while (0)
#ifdef LOG
#include <stdarg.h>
#ifdef LOG
#include <stdarg.h>
+#include <unistd.h>
#include <syslog.h>
#undef info
#include <syslog.h>
#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 {
\
- log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
+#define dbg(format, arg...) \
+ do { \
+ log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
} while (0)
#endif
/* Parser needs it's own debugging statement, we usually don't care about this at all */
#ifdef DEBUG_PARSER
#undef dbg_parse
} while (0)
#endif
/* 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 {
\
- log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
+#define dbg_parse(format, arg...) \
+ do { \
+ log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
} while (0)
#endif
} while (0)
#endif
-
static void log_message
(int level, const char *format, ...)
+
extern void log_message
(int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
__attribute__ ((format (printf, 2, 3)));
-static inline void log_message (int level, const char *format, ...)
-{
- va_list args;
- va_start(args, format);
- vsyslog(level, format, args);
- va_end(args);
+#undef logging_init
+static inline void logging_init(const char *program_name)
+{
+ openlog(program_name, LOG_PID, LOG_DAEMON);
}
}
-/* each program must declare this variable somewhere */
-extern unsigned char logname[42];
-
-static inline void init_logging(char *program_name)
+#undef logging_close
+static inline void logging_close(void)
{
{
- snprintf(logname, 42,"%s[%d]", program_name, getpid());
- openlog(logname, 0, LOG_DAEMON);
+ closelog();
}
#endif /* LOG */
}
#endif /* LOG */