diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-24 07:47:14 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-27 10:41:21 +0900 |
| commit | f1d07d83ab684bc92ac91f0973583e9e4de232c4 (patch) | |
| tree | 3b7fea54dabf700a27fc0032b226a0a80ee5f2f6 /src/network/networkctl.c | |
| parent | 8f60c998abeabc7582abfe11d459f4391a298861 (diff) | |
| download | systemd-f1d07d83ab684bc92ac91f0973583e9e4de232c4.tar.gz | |
networkctl: use table_add_string_line() at one more place
Diffstat (limited to 'src/network/networkctl.c')
| -rw-r--r-- | src/network/networkctl.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 410e4dfc0d..a2e216e779 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -1569,6 +1569,10 @@ static int link_status_one( (void) sd_network_link_get_route_domains(info->ifindex, &route_domains); (void) sd_network_link_get_ntp(info->ifindex, &ntp); (void) sd_network_link_get_sip(info->ifindex, &sip); + (void) sd_network_link_get_network_file(info->ifindex, &network); + (void) sd_network_link_get_carrier_bound_to(info->ifindex, &carrier_bound_to); + (void) sd_network_link_get_carrier_bound_by(info->ifindex, &carrier_bound_by); + (void) sd_network_link_get_activation_policy(info->ifindex, &activation_policy); if (info->sd_device) { (void) sd_device_get_property_value(info->sd_device, "ID_NET_LINK_FILE", &link); @@ -1586,11 +1590,6 @@ static int link_status_one( if (r == -ENOMEM) return log_oom(); - (void) sd_network_link_get_network_file(info->ifindex, &network); - - (void) sd_network_link_get_carrier_bound_to(info->ifindex, &carrier_bound_to); - (void) sd_network_link_get_carrier_bound_by(info->ifindex, &carrier_bound_by); - char lease_file[STRLEN("/run/systemd/netif/leases/") + DECIMAL_STR_MAX(int)]; xsprintf(lease_file, "/run/systemd/netif/leases/%i", info->ifindex); @@ -2184,15 +2183,9 @@ static int link_status_one( if (r < 0) return r; - r = sd_network_link_get_activation_policy(info->ifindex, &activation_policy); - if (r >= 0) { - r = table_add_many(table, - TABLE_EMPTY, - TABLE_STRING, "Activation Policy:", - TABLE_STRING, activation_policy); - if (r < 0) - return table_log_add_error(r); - } + r = table_add_string_line(table, "Activation Policy:", activation_policy); + if (r < 0) + return r; r = sd_network_link_get_required_for_online(info->ifindex); if (r >= 0) { |