shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-27 01:57:35 +03:00
Code

networkctl: use RET_GATHER more

Browse Source
This commit is contained in:
Mike Yuan 2023-11-17 20:37:26 +08:00
parent c7ce20f01f
commit e9b7408eb9
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/networkctl.c
View File

@ -2741,23 +2741,25 @@ static int link_renew_one(sd_bus *bus, int index, const char *name) {
static int link_renew(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
int index, k = 0, r;
int r;
r = acquire_bus(&bus);
if (r < 0)
return r;
r = 0;
for (int i = 1; i < argc; i++) {
int index;
index = rtnl_resolve_interface_or_warn(&rtnl, argv[i]);
if (index < 0)
return index;
r = link_renew_one(bus, index, argv[i]);
if (r < 0 && k >= 0)
k = r;
RET_GATHER(r, link_renew_one(bus, index, argv[i]));
}
return k;
return r;
}
static int link_force_renew_one(sd_bus *bus, int index, const char *name) {
@ -3281,23 +3283,22 @@ static int verb_cat(int argc, char *argv[], void *userdata) {
if (link_config) {
r = get_config_files_by_link_config(link_config, &rtnl, &path, &dropins, /* ret_reload = */ NULL);
if (r < 0)
return ret < 0 ? ret : r;
return RET_GATHER(ret, r);
} else {
r = get_config_files_by_name(*name, &path, &dropins);
if (r == -ENOENT) {
log_error_errno(r, "Cannot find network config file '%s'.", *name);
ret = ret < 0 ? ret : r;
RET_GATHER(ret, log_error_errno(r, "Cannot find network config file '%s'.", *name));
continue;
}
if (r < 0) {
log_error_errno(r, "Failed to get the path of network config '%s': %m", *name);
return ret < 0 ? ret : r;
return RET_GATHER(ret, r);
}
}
r = cat_files(path, dropins, /* flags = */ CAT_FORMAT_HAS_SECTIONS);
if (r < 0)
return ret < 0 ? ret : r;
return RET_GATHER(ret, r);
}
return ret;