diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-11-27 20:20:23 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-11-27 22:05:24 +0100 |
commit | 79008bddf679a5e0900369950eb346c9fa687107 (patch) | |
tree | 620eed51b44a64aa065c4184a4661c8c95c146e3 /src/shared/log.h | |
parent | e09ca588d25a0c383880d6c2f5b129296af781ab (diff) |
log: rearrange log function naming
- Rename log_meta() → log_internal(), to follow naming scheme of most
other log functions that are usually invoked through macros, but never
directly.
- Rename log_info_object() to log_object_info(), simply because the
object should be before any other parameters, to follow OO-style
programming style.
Diffstat (limited to 'src/shared/log.h')
-rw-r--r-- | src/shared/log.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/shared/log.h b/src/shared/log.h index 9dd68df500..278010432d 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__) |