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: a few more log_*_errno + return simplifications
[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 c676fd1c1890cd89903dfebb2b470f7c290659f7..4dbacd13dc3a3b0359aa0607e0ece8d8f425c37d 100644
(file)
--- a/
src/modules-load/modules-load.c
+++ b/
src/modules-load/modules-load.c
@@
-44,7
+44,7
@@
static void systemd_kmod_log(void *data, int priority, const char *file, int lin
const char *fn, const char *format, va_list args) {
DISABLE_WARNING_FORMAT_NONLITERAL;
const char *fn, const char *format, va_list args) {
DISABLE_WARNING_FORMAT_NONLITERAL;
- log_
metav(priority
, file, line, fn, format, args);
+ log_
internalv(priority, 0
, file, line, fn, format, args);
REENABLE_WARNING;
}
REENABLE_WARNING;
}
@@
-81,10
+81,8
@@
static int load_module(struct kmod_ctx *ctx, const char *m) {
log_debug("load: %s", m);
r = kmod_module_new_from_lookup(ctx, m, &modlist);
log_debug("load: %s", m);
r = kmod_module_new_from_lookup(ctx, m, &modlist);
- if (r < 0) {
- log_error("Failed to lookup alias '%s': %s", m, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to lookup alias '%s': %m", m);
if (!modlist) {
log_error("Failed to find module '%s'", m);
if (!modlist) {
log_error("Failed to find module '%s'", m);
@@
-116,8
+114,7
@@
static int load_module(struct kmod_ctx *ctx, const char *m) {
else if (err == KMOD_PROBE_APPLY_BLACKLIST)
log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
else {
else if (err == KMOD_PROBE_APPLY_BLACKLIST)
log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
else {
- log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
- strerror(-err));
+ log_error_errno(err, "Failed to insert '%s': %m", kmod_module_get_name(mod));
r = err;
}
}
r = err;
}
}
@@
-142,8
+139,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));
- return r;
+ return log_error_errno(r, "Failed to open %s, ignoring: %m", path);
}
log_debug("apply: %s", path);
}
log_debug("apply: %s", path);
@@
-237,7
+233,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
+267,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;