diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-09-08 19:45:58 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-10-24 14:20:48 +0900 |
| commit | e4857ee2f2a4c28a8a3aa6efef2dc9f769a25baf (patch) | |
| tree | 2d4bcd16a9765115725e1259adadcb611647708b | |
| parent | d56d6cb8cab19ec042efc8987a1684bbc4157328 (diff) | |
| download | systemd-e4857ee2f2a4c28a8a3aa6efef2dc9f769a25baf.tar.gz | |
networkctl: use format_ifname_full()
| -rw-r--r-- | src/network/networkctl.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 64778d6e84..09290560f5 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -719,10 +719,8 @@ static int dump_gateways( if (ifindex <= 0) { char name[IF_NAMESIZE+1]; - if (format_ifname(local[i].ifindex, name)) - r = table_add_cell_stringf(table, NULL, "%s on %s", with_description ?: gateway, name); - else - r = table_add_cell_stringf(table, NULL, "%s on %%%i", with_description ?: gateway, local[i].ifindex); + r = table_add_cell_stringf(table, NULL, "%s on %s", with_description ?: gateway, + format_ifname_full(local[i].ifindex, name, FORMAT_IFNAME_IFINDEX_WITH_PERCENT)); } else r = table_add_cell(table, NULL, TABLE_STRING, with_description ?: gateway); if (r < 0) @@ -775,10 +773,8 @@ static int dump_addresses( if (ifindex <= 0) { char name[IF_NAMESIZE+1]; - if (format_ifname(local[i].ifindex, name)) - r = table_add_cell_stringf(table, NULL, "%s on %s", pretty, name); - else - r = table_add_cell_stringf(table, NULL, "%s on %%%i", pretty, local[i].ifindex); + r = table_add_cell_stringf(table, NULL, "%s on %s", pretty, + format_ifname_full(local[i].ifindex, name, FORMAT_IFNAME_IFINDEX_WITH_PERCENT)); } else r = table_add_cell(table, NULL, TABLE_STRING, pretty); if (r < 0) @@ -1764,10 +1760,8 @@ static int link_delete(int argc, char *argv[], void *userdata) { if (r < 0) { char ifname[IF_NAMESIZE + 1]; - if (format_ifname(index, ifname)) - return log_error_errno(r, "Failed to delete interface %s: %m", ifname); - else - return log_error_errno(r, "Failed to delete interface %d: %m", index); + return log_error_errno(r, "Failed to delete interface %s: %m", + format_ifname_full(index, ifname, FORMAT_IFNAME_IFINDEX)); } } |