treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all
low-level logging calls and intrdouce log_error_errno() as log calls
that take error numbers", use sed to convert the simple cases to use
the new macros:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/'
Multi-line log_*() invocations are not covered.
And we also should add log_unit_*_errno().
This commit is contained in:
@@ -82,7 +82,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
|
||||
|
||||
r = kmod_module_new_from_lookup(ctx, m, &modlist);
|
||||
if (r < 0) {
|
||||
log_error("Failed to lookup alias '%s': %s", m, strerror(-r));
|
||||
log_error_errno(-r, "Failed to lookup alias '%s': %m", m);
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
|
||||
if (ignore_enoent && r == -ENOENT)
|
||||
return 0;
|
||||
|
||||
log_error("Failed to open %s, ignoring: %s", path, strerror(-r));
|
||||
log_error_errno(-r, "Failed to open %s, ignoring: %m", path);
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -237,7 +237,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
r = parse_proc_cmdline(parse_proc_cmdline_item);
|
||||
if (r < 0)
|
||||
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
|
||||
log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
|
||||
|
||||
ctx = kmod_new(NULL, NULL);
|
||||
if (!ctx) {
|
||||
@@ -271,7 +271,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
|
||||
if (k < 0) {
|
||||
log_error("Failed to enumerate modules-load.d files: %s", strerror(-k));
|
||||
log_error_errno(-k, "Failed to enumerate modules-load.d files: %m");
|
||||
if (r == 0)
|
||||
r = k;
|
||||
goto finish;
|
||||
|
||||
Reference in New Issue
Block a user