picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

networkctl: use format_ifname_full()

Browse source
This commit is contained in:
Yu Watanabe 2019-09-08 19:45:58 +09:00
parent d56d6cb8ca
commit e4857ee2f2
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/network/networkctl.c
View file

@ -719,10 +719,8 @@ static int dump_gateways(
if (ifindex <= 0) { if (ifindex <= 0) {
char name[IF_NAMESIZE+1]; 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,
r = table_add_cell_stringf(table, NULL, "%s on %s", with_description ?: gateway, name); format_ifname_full(local[i].ifindex, name, FORMAT_IFNAME_IFINDEX_WITH_PERCENT));
else
r = table_add_cell_stringf(table, NULL, "%s on %%%i", with_description ?: gateway, local[i].ifindex);
} else } else
r = table_add_cell(table, NULL, TABLE_STRING, with_description ?: gateway); r = table_add_cell(table, NULL, TABLE_STRING, with_description ?: gateway);
if (r < 0) if (r < 0)
@ -775,10 +773,8 @@ static int dump_addresses(
if (ifindex <= 0) { if (ifindex <= 0) {
char name[IF_NAMESIZE+1]; char name[IF_NAMESIZE+1];
if (format_ifname(local[i].ifindex, name)) r = table_add_cell_stringf(table, NULL, "%s on %s", pretty,
r = table_add_cell_stringf(table, NULL, "%s on %s", pretty, name); format_ifname_full(local[i].ifindex, name, FORMAT_IFNAME_IFINDEX_WITH_PERCENT));
else
r = table_add_cell_stringf(table, NULL, "%s on %%%i", pretty, local[i].ifindex);
} else } else
r = table_add_cell(table, NULL, TABLE_STRING, pretty); r = table_add_cell(table, NULL, TABLE_STRING, pretty);
if (r < 0) if (r < 0)
@ -1764,10 +1760,8 @@ static int link_delete(int argc, char *argv[], void *userdata) {
if (r < 0) { if (r < 0) {
char ifname[IF_NAMESIZE + 1]; char ifname[IF_NAMESIZE + 1];
if (format_ifname(index, ifname)) return log_error_errno(r, "Failed to delete interface %s: %m",
return log_error_errno(r, "Failed to delete interface %s: %m", ifname); format_ifname_full(index, ifname, FORMAT_IFNAME_IFINDEX));
else
return log_error_errno(r, "Failed to delete interface %d: %m", index);
} }
} }