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

settings: suppress warnings about NULL hash tables

Browse source
This commit is contained in:
Dan Williams 2011-05-26 19:43:19 -05:00
parent 0e7b71102b
commit 232bb3cea2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/settings/nm-settings-connection.c
View file

@ -320,7 +320,8 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self,
* should not. Thus we preserve non-system-owned secrets here.
*/
transient_secrets = nm_connection_to_hash (NM_CONNECTION (self), NM_SETTING_HASH_FLAG_ONLY_SECRETS);
for_each_secret (NM_CONNECTION (self), transient_secrets, clear_system_secrets, NULL);
if (transient_secrets)
for_each_secret (NM_CONNECTION (self), transient_secrets, clear_system_secrets, NULL);
new_settings = nm_connection_to_hash (new, NM_SETTING_HASH_FLAG_ALL);
g_assert (new_settings);
@ -349,7 +350,8 @@ nm_settings_connection_replace_settings (NMSettingsConnection *self,
success = TRUE;
}
g_hash_table_destroy (new_settings);
g_hash_table_destroy (transient_secrets);
if (transient_secrets)
g_hash_table_destroy (transient_secrets);
return success;
}