X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=logging.h;h=904355cb2cf4fa4f590f3bcd7f950069ca95cefe;hp=e7653ee1b85228503d7a61fcd9dfbe3284c37b51;hb=197178360f5c4253aeb743b32224125e58e2fd5d;hpb=e5e322bc627a07d29a07e08f7c96bd644a3ae057 diff --git a/logging.h b/logging.h index e7653ee1b..904355cb2 100644 --- a/logging.h +++ b/logging.h @@ -24,6 +24,7 @@ #ifndef LOGGING_H #define LOGGING_H +#define err(format, arg...) do { } while (0) #define info(format, arg...) do { } while (0) #define dbg(format, arg...) do { } while (0) #define logging_init(foo) do { } while (0) @@ -34,21 +35,27 @@ #include #include +#undef err +#define err(format, arg...) \ + do { \ + log_message(LOG_INFO ,"%s: " format ,__FILE__ ,## arg); \ + } while (0) + #undef info #define info(format, arg...) \ do { \ - log_message(LOG_INFO , format , ## arg); \ + log_message(LOG_INFO ,"%s: " format ,__FILE__ ,## 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 -extern void log_message(int level, const char *format, ...) +extern void log_message(int priority, const char *format, ...) __attribute__ ((format (printf, 2, 3))); #undef logging_init