SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use table_log_add_error()

Browse Source
This commit is contained in:
Yu Watanabe
2020-01-10 18:28:30 +09:00
parent 964a7745de
commit bd17fa8cd8
6 changed files with 96 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkctl.c
+63 -54
View File
@@ -557,7 +557,7 @@ static int list_links(int argc, char *argv[], void *userdata) {
TABLE_STRING, strna(setup_state),
TABLE_SET_COLOR, on_color_setup);
if (r < 0)
return r;
return table_log_add_error(r);
}
r = table_print(table, NULL);
@@ -732,7 +732,7 @@ static int dump_gateways(
TABLE_EMPTY,
TABLE_STRING, i == 0 ? "Gateway:" : "");
if (r < 0)
return r;
return table_log_add_error(r);
r = in_addr_to_string(local[i].family, &local[i].address, &gateway);
if (r < 0)
@@ -758,7 +758,7 @@ static int dump_gateways(
} else
r = table_add_cell(table, NULL, TABLE_STRING, with_description ?: gateway);
if (r < 0)
return r;
return table_log_add_error(r);
}
return 0;
@@ -789,7 +789,7 @@ static int dump_addresses(
TABLE_EMPTY,
TABLE_STRING, i == 0 ? "Address:" : "");
if (r < 0)
return r;
return table_log_add_error(r);
r = in_addr_to_string(local[i].family, &local[i].address, &pretty);
if (r < 0)
@@ -812,7 +812,7 @@ static int dump_addresses(
} else
r = table_add_cell(table, NULL, TABLE_STRING, pretty);
if (r < 0)
return r;
return table_log_add_error(r);
}
return 0;
@@ -841,7 +841,7 @@ static int dump_address_labels(sd_netlink *rtnl) {
table = table_new("label", "prefix/prefixlen");
if (!table)
return -ENOMEM;
return log_oom();
if (arg_full)
table_set_width(table, 0);
@@ -889,14 +889,18 @@ static int dump_address_labels(sd_netlink *rtnl) {
r = table_add_cell(table, NULL, TABLE_UINT32, &label);
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%s/%u", pretty, prefixlen);
if (r < 0)
return r;
return table_log_add_error(r);
}
return table_print(table, NULL);
r = table_print(table, NULL);
if (r < 0)
return log_error_errno(r, "Failed to print table: %m");
return 0;
}
static int list_address_labels(int argc, char *argv[], void *userdata) {
@@ -988,7 +992,7 @@ static int dump_lldp_neighbors(Table *table, const char *prefix, int ifindex) {
TABLE_EMPTY,
TABLE_STRING, c == 0 ? prefix : "");
if (r < 0)
return r;
return table_log_add_error(r);
(void) sd_lldp_neighbor_get_system_name(n, &system_name);
(void) sd_lldp_neighbor_get_port_id_as_string(n, &port_id);
@@ -1001,7 +1005,7 @@ static int dump_lldp_neighbors(Table *table, const char *prefix, int ifindex) {
strempty(port_description),
isempty(port_description) ? "" : ")");
if (r < 0)
return r;
return table_log_add_error(r);
c++;
}
@@ -1024,7 +1028,7 @@ static int dump_ifindexes(Table *table, const char *prefix, const int *ifindexes
TABLE_STRING, c == 0 ? prefix : "",
TABLE_IFINDEX, ifindexes[c]);
if (r < 0)
return r;
return table_log_add_error(r);
}
return 0;
@@ -1043,7 +1047,7 @@ static int dump_list(Table *table, const char *prefix, char **l) {
TABLE_STRING, i == l ? prefix : "",
TABLE_STRING, *i);
if (r < 0)
return r;
return table_log_add_error(r);
}
return 0;
@@ -1054,12 +1058,12 @@ static int dump_list(Table *table, const char *prefix, char **l) {
TABLE_EMPTY, \
TABLE_STRING, name ":"); \
if (r < 0) \
return r; \
return table_log_add_error(r); \
r = table_add_cell(table, NULL, \
info->has_stats64 ? TABLE_UINT64 : TABLE_UINT32, \
info->has_stats64 ? (void*) &info->stats64.val_name : (void*) &info->stats.val_name); \
if (r < 0) \
return r;
return table_log_add_error(r);
static int dump_statistics(Table *table, const LinkInfo *info) {
int r;
@@ -1201,7 +1205,7 @@ static int link_status_one(
table = table_new("dot", "key", "value");
if (!table)
return -ENOMEM;
return log_oom();
if (arg_full)
table_set_width(table, 0);
@@ -1218,10 +1222,10 @@ static int link_status_one(
TABLE_STRING, special_glyph(SPECIAL_GLYPH_BLACK_CIRCLE),
TABLE_SET_COLOR, on_color_operational);
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, &cell, "%i: %s", info->ifindex, info->name);
if (r < 0)
return r;
return table_log_add_error(r);
(void) table_set_align_percent(table, cell, 0);
r = table_add_many(table,
@@ -1239,14 +1243,14 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "State:");
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%s%s%s (%s%s%s)",
on_color_operational, strna(operational_state), off_color_operational,
on_color_setup, strna(setup_state), off_color_setup);
if (r < 0)
return r;
return table_log_add_error(r);
STRV_FOREACH(p, info->alternative_names)
STRV_FOREACH(p, info->alternative_names) {
if (p == info->alternative_names)
r = table_add_many(table,
TABLE_EMPTY,
@@ -1257,6 +1261,9 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_EMPTY,
TABLE_STRING, *p);
if (r < 0)
return table_log_add_error(r);
}
if (path) {
r = table_add_many(table,
@@ -1264,7 +1271,7 @@ static int link_status_one(
TABLE_STRING, "Path:",
TABLE_STRING, path);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (driver) {
r = table_add_many(table,
@@ -1272,7 +1279,7 @@ static int link_status_one(
TABLE_STRING, "Driver:",
TABLE_STRING, driver);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (vendor) {
r = table_add_many(table,
@@ -1280,7 +1287,7 @@ static int link_status_one(
TABLE_STRING, "Vendor:",
TABLE_STRING, vendor);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (model) {
r = table_add_many(table,
@@ -1288,7 +1295,7 @@ static int link_status_one(
TABLE_STRING, "Model:",
TABLE_STRING, model);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->has_mac_address) {
@@ -1301,14 +1308,14 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "HW Address:");
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%s%s%s%s",
ether_addr_to_string(&info->mac_address, ea),
description ? " (" : "",
strempty(description),
description ? ")" : "");
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->has_permanent_mac_address) {
@@ -1321,14 +1328,14 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "HW Permanent Address:");
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%s%s%s%s",
ether_addr_to_string(&info->permanent_mac_address, ea),
description ? " (" : "",
strempty(description),
description ? ")" : "");
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->mtu > 0) {
@@ -1341,7 +1348,7 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "MTU:");
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%" PRIu32 "%s%s%s%s%s%s%s",
info->mtu,
info->min_mtu > 0 || info->max_mtu > 0 ? " (" : "",
@@ -1352,7 +1359,7 @@ static int link_status_one(
info->max_mtu > 0 ? max_str : "",
info->min_mtu > 0 || info->max_mtu > 0 ? ")" : "");
if (r < 0)
return r;
return table_log_add_error(r);
}
if (streq_ptr(info->netdev_kind, "bridge")) {
@@ -1379,7 +1386,7 @@ static int link_status_one(
TABLE_STRING, "Multicast IGMP Version:",
TABLE_UINT8, info->mcast_igmp_version);
if (r < 0)
return r;
return table_log_add_error(r);
} else if (streq_ptr(info->netdev_kind, "vxlan")) {
if (info->vxlan_info.vni > 0) {
@@ -1388,7 +1395,7 @@ static int link_status_one(
TABLE_STRING, "VNI:",
TABLE_UINT32, info->vxlan_info.vni);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (IN_SET(info->vxlan_info.group_family, AF_INET, AF_INET6)) {
@@ -1398,7 +1405,7 @@ static int link_status_one(
info->vxlan_info.group_family == AF_INET ? TABLE_IN_ADDR : TABLE_IN6_ADDR,
&info->vxlan_info.group);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (IN_SET(info->vxlan_info.local_family, AF_INET, AF_INET6)) {
@@ -1408,7 +1415,7 @@ static int link_status_one(
info->vxlan_info.local_family == AF_INET ? TABLE_IN_ADDR : TABLE_IN6_ADDR,
&info->vxlan_info.local);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->vxlan_info.dest_port > 0) {
@@ -1417,7 +1424,7 @@ static int link_status_one(
TABLE_STRING, "Destination Port:",
TABLE_UINT16, be16toh(info->vxlan_info.dest_port));
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->vxlan_info.link > 0) {
@@ -1426,7 +1433,7 @@ static int link_status_one(
TABLE_STRING, "Underlying Device:",
TABLE_IFINDEX, info->vxlan_info.link);
if (r < 0)
return r;
return table_log_add_error(r);
}
}
@@ -1438,7 +1445,7 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "WiFi access point:");
if (r < 0)
return r;
return table_log_add_error(r);
if (info->ssid)
esc = cescape(info->ssid);
@@ -1447,7 +1454,7 @@ static int link_status_one(
strnull(esc),
ether_addr_to_string(&info->bssid, buf));
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->has_bitrates) {
@@ -1457,12 +1464,12 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "Bit Rate (Tx/Rx):");
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%sbps/%sbps",
format_bytes_full(tx, sizeof tx, info->tx_bitrate, 0),
format_bytes_full(rx, sizeof rx, info->rx_bitrate, 0));
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->has_tx_queues || info->has_rx_queues) {
@@ -1470,10 +1477,10 @@ static int link_status_one(
TABLE_EMPTY,
TABLE_STRING, "Queue Length (Tx/Rx):");
if (r < 0)
return r;
return table_log_add_error(r);
r = table_add_cell_stringf(table, NULL, "%" PRIu32 "/%" PRIu32, info->tx_queues, info->rx_queues);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->has_ethtool_link_info) {
@@ -1486,7 +1493,7 @@ static int link_status_one(
TABLE_STRING, "Auto negotiation:",
TABLE_BOOLEAN, info->autonegotiation == AUTONEG_ENABLE);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (info->speed > 0) {
@@ -1495,7 +1502,7 @@ static int link_status_one(
TABLE_STRING, "Speed:",
TABLE_BPS, (uint64_t) info->speed);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (duplex) {
@@ -1504,7 +1511,7 @@ static int link_status_one(
TABLE_STRING, "Duplex:",
TABLE_STRING, duplex);
if (r < 0)
return r;
return table_log_add_error(r);
}
if (port) {
@@ -1513,7 +1520,7 @@ static int link_status_one(
TABLE_STRING, "Port:",
TABLE_STRING, port);
if (r < 0)
return r;
return table_log_add_error(r);
}
}
@@ -1549,7 +1556,7 @@ static int link_status_one(
TABLE_STRING, "Time Zone:",
TABLE_STRING, tz);
if (r < 0)
return r;
return table_log_add_error(r);
}
r = dump_lldp_neighbors(table, "Connected To:", info->ifindex);
@@ -1562,7 +1569,7 @@ static int link_status_one(
r = table_print(table, NULL);
if (r < 0)
return r;
return log_error_errno(r, "Failed to print table: %m");
return show_logs(info);
}
@@ -1582,7 +1589,7 @@ static int system_status(sd_netlink *rtnl, sd_hwdb *hwdb) {
table = table_new("dot", "key", "value");
if (!table)
return -ENOMEM;
return log_oom();
if (arg_full)
table_set_width(table, 0);
@@ -1602,6 +1609,8 @@ static int system_status(sd_netlink *rtnl, sd_hwdb *hwdb) {
TABLE_STRING, "State:",
TABLE_STRING, strna(operational_state),
TABLE_SET_COLOR, on_color_operational);
if (r < 0)
return table_log_add_error(r);
r = dump_addresses(rtnl, table, 0);
if (r < 0)
@@ -1632,7 +1641,7 @@ static int system_status(sd_netlink *rtnl, sd_hwdb *hwdb) {
r = table_print(table, NULL);
if (r < 0)
return r;
return log_error_errno(r, "Failed to print table: %m");
return show_logs(NULL);
}
@@ -1752,7 +1761,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
"port id",
"port description");
if (!table)
return -ENOMEM;
return log_oom();
if (arg_full)
table_set_width(table, 0);
@@ -1844,7 +1853,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
TABLE_STRING, strna(port_id),
TABLE_STRING, strna(port_description));
if (r < 0)
return r;
return table_log_add_error(r);
m++;
}
@@ -1852,7 +1861,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
r = table_print(table, NULL);
if (r < 0)
return r;
return log_error_errno(r, "Failed to print table: %m");
if (arg_legend) {
lldp_capabilities_legend(all);