chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
modules-load
/
modules-load.c
diff --git
a/src/modules-load/modules-load.c
b/src/modules-load/modules-load.c
index 5353814d17ab67b1c7d06f3ae7d8e74b8dfc160b..30c67a41bdf143c87610e4bd49c6d99e89c8781d 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-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) {
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;
}
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;
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;
}
return r;
}
@@
-237,7
+237,7
@@
int main(int argc, char *argv[]) {
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
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) {
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) {
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;
if (r == 0)
r = k;
goto finish;