fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 06:38:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: avoid duplicate lookup of bond-option in write_bond_setting()

Browse source 
Now that nm_setting_bond_get_option() has a stable order
(alphabetically), we no longer need to sort it.
This commit is contained in:
Thomas Haller 2017-11-21 12:42:12 +01:00
parent d5b3c6ee53
commit 6b319cd072
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -1311,21 +1311,14 @@ write_bond_setting (NMConnection *connection, shvarFile *ifcfg, gboolean *wired,
num_opts = nm_setting_bond_get_num_options (s_bond); num_opts = nm_setting_bond_get_num_options (s_bond);
if (num_opts) { if (num_opts) {
nm_auto_free_gstring GString *str = NULL; nm_auto_free_gstring GString *str = NULL;
gs_free const char **options = NULL; const char *name, *value;
const char *value;
str = g_string_sized_new (64); str = g_string_sized_new (64);
options = g_new (const char *, num_opts);
for (i = 0; i < num_opts; i++)
nm_setting_bond_get_option (s_bond, i, &options[i], &value);
g_qsort_with_data (options, num_opts, sizeof (const char *),
nm_strcmp_p_with_data, NULL);
for (i = 0; i < num_opts; i++) { for (i = 0; i < num_opts; i++) {
if (str->len) if (str->len)
g_string_append_c (str, ' '); g_string_append_c (str, ' ');
value = nm_setting_bond_get_option_by_name (s_bond, options[i]); nm_setting_bond_get_option (s_bond, i, &name, &value);
g_string_append_printf (str, "%s=%s", options[i], value); g_string_append_printf (str, "%s=%s", name, value);
} }
svSetValueStr (ifcfg, "BONDING_OPTS", str->str); svSetValueStr (ifcfg, "BONDING_OPTS", str->str);