diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-11-28 10:26:48 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-11-28 10:26:48 -0500 |
| commit | e72e57a66f80866f87602845c361c8f13ae54bd0 (patch) | |
| tree | 244302c0a188d03f7713558fc241d7663e6492bc | |
| parent | 107530eaa336ae23f53a0f573901799564379106 (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.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | src/shared/log.c | 8 | ||||
| -rw-r--r-- | src/shared/log.h | 10 | ||||
| -rw-r--r-- | src/udev/udev-builtin-kmod.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/shared/log.c b/src/shared/log.c index 6ed18e36da..61fe00fc38 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -465,7 +465,7 @@ static int log_dispatch( return r; } -int log_metav( +int log_internalv( int level, int error, const char*file, @@ -486,7 +486,7 @@ int log_metav( return log_dispatch(level, error, file, line, func, NULL, NULL, buffer); } -int log_meta( +int log_internal( int level, int error, const char*file, @@ -498,7 +498,7 @@ int log_meta( va_list ap; va_start(ap, format); - r = log_metav(level, error, file, line, func, format, ap); + r = log_internalv(level, error, file, line, func, format, ap); va_end(ap); return r; @@ -537,7 +537,7 @@ noreturn void log_assert_failed_unreachable(const char *text, const char *file, } int log_oom_internal(const char *file, int line, const char *func) { - log_meta(LOG_ERR, ENOMEM, file, line, func, "Out of memory."); + log_internal(LOG_ERR, ENOMEM, file, line, func, "Out of memory."); return -ENOMEM; } diff --git a/src/shared/log.h b/src/shared/log.h index 7d65aec055..3e317a5e94 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -52,18 +52,18 @@ void log_close_journal(void); void log_close_kmsg(void); void log_close_console(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, @@ -92,7 +92,7 @@ noreturn void log_assert_failed_unreachable( #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__) diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c index 0d9c9d9c1a..8f1694bc53 100644 --- a/src/udev/udev-builtin-kmod.c +++ b/src/udev/udev-builtin-kmod.c @@ -86,7 +86,7 @@ static int load_module(struct udev *udev, const char *alias) { } _printf_(6,0) static void udev_kmod_log(void *data, int priority, const char *file, int line, const char *fn, const char *format, va_list args) { - log_metav(priority, 0, file, line, fn, format, args); + log_internalv(priority, 0, file, line, fn, format, args); } static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test) { |