X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=logging.h;h=1c27917f61e4ed89ecc6e8b6b3a28f615c51d853;hb=e4f9c4a46de499841939c51da1a1cf6fd5321bb1;hp=5ae228b139fa778379ac0e03011b44adfd1bd60c;hpb=4d803d8d04a8493f8efc039c7789c65be33048a0;p=elogind.git diff --git a/logging.h b/logging.h index 5ae228b13..1c27917f6 100644 --- a/logging.h +++ b/logging.h @@ -34,20 +34,17 @@ #include #include -#include "udev.h" -#include "udev_version.h" - #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 { \ - log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \ + log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \ } while (0) #endif @@ -56,25 +53,14 @@ #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 -static void log_message (int level, const char *format, ...) +extern void log_message(int level, const char *format, ...) __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 */ +/* each program that uses syslog must declare this variable somewhere */ extern unsigned char logname[42]; #undef init_logging