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] let the extras/ programs build "pretty" also
[elogind.git]
/
logging.h
diff --git
a/logging.h
b/logging.h
index 5ae228b139fa778379ac0e03011b44adfd1bd60c..40c342c3ab0c04c7b2690c1e34548f06c49ee0ee 100644
(file)
--- a/
logging.h
+++ b/
logging.h
@@
-34,20
+34,19
@@
#include <unistd.h>
#include <syslog.h>
#include <unistd.h>
#include <syslog.h>
-#include "udev.h"
-#include "udev_version.h"
+#define LOGNAME_SIZE 42
#undef info
#define info(format, arg...) \
do { \
#undef info
#define info(format, arg...) \
do { \
- log_message
(LOG_INFO , format , ## arg);
\
+ log_message
(LOG_INFO , format , ## arg);
\
} while (0)
#ifdef DEBUG
#undef dbg
#define dbg(format, arg...) \
do { \
} while (0)
#ifdef DEBUG
#undef dbg
#define dbg(format, arg...) \
do { \
- log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
+ log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
} while (0)
#endif
} while (0)
#endif
@@
-56,31
+55,20
@@
#undef dbg_parse
#define dbg_parse(format, arg...) \
do { \
#undef dbg_parse
#define dbg_parse(format, arg...) \
do { \
- log_message
(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);
\
+ 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;
-
- if (0 != strncmp(udev_log_str, UDEV_LOG_DEFAULT, BOOL_SIZE))
- return;
-
- va_start(args, format);
- vsyslog(level, format, args);
- va_end(args);
-}
-/* each program must declare this variable somewhere */
-extern unsigned char logname[
42
];
+/* each program
that uses syslog
must declare this variable somewhere */
+extern unsigned char logname[
LOGNAME_SIZE
];
#undef init_logging
static inline void init_logging(char *program_name)
{
#undef init_logging
static inline void init_logging(char *program_name)
{
- snprintf(logname,
42
,"%s[%d]", program_name, getpid());
+ snprintf(logname,
LOGNAME_SIZE
,"%s[%d]", program_name, getpid());
openlog(logname, 0, LOG_DAEMON);
}
openlog(logname, 0, LOG_DAEMON);
}