X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flog.h;fp=src%2Fshared%2Flog.h;h=278010432de3aa7ca90fd6bf2d77729c508f8dbb;hb=79008bddf679a5e0900369950eb346c9fa687107;hp=9dd68df500fde3f4458f15872ed788440a40a134;hpb=e09ca588d25a0c383880d6c2f5b129296af781ab;p=elogind.git diff --git a/src/shared/log.h b/src/shared/log.h index 9dd68df50..278010432 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -75,40 +75,40 @@ void log_close_console(void); void log_parse_environment(void); -int log_meta( +int log_internal( int level, int error, - const char*file, + const char *file, int line, const char *func, const char *format, ...) _printf_(6,7); -int log_metav( +int log_internalv( int level, int error, - const char*file, + const char *file, int line, const char *func, const char *format, va_list ap) _printf_(6,0); -int log_meta_object( +int log_object_internal( int level, int error, - const char*file, + const char *file, int line, const char *func, - const char *object_name, + const char *object_field, const char *object, const char *format, ...) _printf_(8,9); -int log_metav_object( +int log_object_internalv( int level, int error, const char*file, int line, const char *func, - const char *object_name, + const char *object_field, const char *object, const char *format, va_list ap) _printf_(8,0); @@ -130,7 +130,7 @@ int log_oom_internal( int log_dump_internal( int level, int error, - const char*file, + const char *file, int line, const char *func, char *buffer); @@ -158,7 +158,7 @@ void log_assert_failed_return( #define log_full_errno(level, error, ...) \ do { \ if (log_get_max_level() >= (level)) \ - log_meta((level), error, __FILE__, __LINE__, __func__, __VA_ARGS__); \ + log_internal((level), error, __FILE__, __LINE__, __func__, __VA_ARGS__); \ } while (false) #define log_full(level, ...) log_full_errno(level, 0, __VA_ARGS__)