system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 02:34:54 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

modules-load: use RET_GATHER, update error handling

Browse source 
We would try to return the first error, but conf_files_list_nulstr()
failure would terminate the app immediately. So let's just return the
error from conf_files_list_nulstr(), and the first error encountered for
other failures after which we continue.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-07-09 13:35:33 -06:00
parent fa989c74a6
commit eb6cae1a40
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/modules-load/modules-load.c
View file

@ -97,8 +97,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
k = module_load_and_warn(ctx, l, true);
if (k == -ENOENT)
continue;
if (k < 0 && r >= 0)
r = k;
RET_GATHER(r, k);
}
return r;
@ -186,11 +185,8 @@ static int run(int argc, char *argv[]) {
r = 0;
if (argc > optind) {
for (int i = optind; i < argc; i++) {
k = apply_file(ctx, argv[i], false);
if (k < 0 && r == 0)
r = k;
}
for (int i = optind; i < argc; i++)
RET_GATHER(r, apply_file(ctx, argv[i], false));
} else {
_cleanup_strv_free_ char **files = NULL;
@ -199,23 +195,15 @@ static int run(int argc, char *argv[]) {
k = module_load_and_warn(ctx, *i, true);
if (k == -ENOENT)
continue;
if (k < 0 && r == 0)
r = k;
RET_GATHER(r, k);
}
k = conf_files_list_nulstr(&files, ".conf", NULL, 0, conf_file_dirs);
if (k < 0) {
log_error_errno(k, "Failed to enumerate modules-load.d files: %m");
if (r == 0)
r = k;
return r;
}
if (k < 0)
return log_error_errno(k, "Failed to enumerate modules-load.d files: %m");
STRV_FOREACH(fn, files) {
k = apply_file(ctx, *fn, true);
if (k < 0 && r == 0)
r = k;
}
STRV_FOREACH(fn, files)
RET_GATHER(r, apply_file(ctx, *fn, true));
}
return r;