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/sysv-generator/sysv-generator.c | |
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/sysv-generator/sysv-generator.c')
-rw-r--r-- | src/sysv-generator/sysv-generator.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 6e4cdd694e..a2f853380c 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -192,7 +192,7 @@ static int generate_unit_file(SysvStub *s) { STRV_FOREACH(p, s->wanted_by) { r = add_symlink(s->name, *p); if (r < 0) - log_error_unit(s->name, "Failed to create 'Wants' symlink to %s: %s", *p, strerror(-r)); + log_unit_error(s->name, "Failed to create 'Wants' symlink to %s: %s", *p, strerror(-r)); } return 0; @@ -320,7 +320,7 @@ static int load_sysv(SysvStub *s) { if (feof(f)) break; - log_error_unit(s->name, + log_unit_error(s->name, "Failed to read configuration file '%s': %m", s->path); return -errno; @@ -395,7 +395,7 @@ static int load_sysv(SysvStub *s) { fn = strstrip(t+8); if (!path_is_absolute(fn)) { - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] PID file not absolute. Ignoring.", s->path, line); continue; @@ -489,12 +489,12 @@ static int load_sysv(SysvStub *s) { } if (r < 0) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", s->path, line, m, strerror(-r)); } if (!isempty(state_)) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Trailing garbage in Provides, ignoring.", s->path, line); @@ -517,7 +517,7 @@ static int load_sysv(SysvStub *s) { r = sysv_translate_facility(n, basename(s->path), &m); if (r < 0) { - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s", s->path, line, n, strerror(-r)); continue; @@ -551,12 +551,12 @@ static int load_sysv(SysvStub *s) { } if (r < 0) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to add dependency on %s, ignoring: %s", s->path, line, m, strerror(-r)); } if (!isempty(state_)) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Trailing garbage in %*s, ignoring.", s->path, line, (int)(strchr(t, ':') - t), t); |