fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 15:20:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: cleanup unique_master_iface_ifname()

Browse source 
- use appropriate types for integer variables

- rework the confusing loop which would reset the loop-counter
  to start again.
This commit is contained in:
Thomas Haller 2019-08-20 15:25:08 +02:00
parent e1ec22f74b
commit 0e1748afe1
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/cli/connections.c
View file

@ -3733,22 +3733,22 @@ static char *
unique_master_iface_ifname (const GPtrArray *connections,
const char *try_name)
{
NMConnection *connection;
char *new_name;
unsigned num = 1;
int i = 0;
const char *ifname = NULL;
guint num = 0;
guint i;
new_name = g_strdup (try_name);
while (i < connections->len) {
connection = NM_CONNECTION (connections->pdata[i]);
ifname = nm_connection_get_interface_name (connection);
if (g_strcmp0 (new_name, ifname) == 0) {
again:
for (i = 0; i < connections->len; i++) {
NMConnection *connection = connections->pdata[i];
if (nm_streq0 (new_name, nm_connection_get_interface_name (connection))) {
num++;
g_free (new_name);
new_name = g_strdup_printf ("%s%d", try_name, num++);
i = 0;
} else
i++;
new_name = g_strdup_printf ("%s%u", try_name, num);
goto again;
}
}
return new_name;
}