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

libnm: cleanup _nm_setting_use_legacy_property() by using cleanup attribute

Browse source
This commit is contained in:
Thomas Haller 2021-07-27 13:27:53 +02:00
parent 17f0acfdb3
commit 2f5543b3ed
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libnm-core-impl/nm-setting.c
View file

@ -640,36 +640,28 @@ _nm_setting_use_legacy_property(NMSetting * setting,
const char *legacy_property,
const char *new_property)
{
GVariant *setting_dict, *value;
gs_unref_variant GVariant *setting_dict = NULL;
gs_unref_variant GVariant *value = NULL;
setting_dict = g_variant_lookup_value(connection_dict,
nm_setting_get_name(NM_SETTING(setting)),
NM_VARIANT_TYPE_SETTING);
g_return_val_if_fail(setting_dict != NULL, FALSE);
/* If the new property isn't set, we have to use the legacy property. */
value = g_variant_lookup_value(setting_dict, new_property, NULL);
if (!value) {
g_variant_unref(setting_dict);
if (!value)
return TRUE;
}
g_variant_unref(value);
nm_clear_pointer(&value, g_variant_unref);
/* Otherwise, clients always prefer new properties sent from the daemon. */
if (!_nm_utils_is_manager_process) {
g_variant_unref(setting_dict);
if (!_nm_utils_is_manager_process)
return FALSE;
}
/* The daemon prefers the legacy property if it exists. */
value = g_variant_lookup_value(setting_dict, legacy_property, NULL);
g_variant_unref(setting_dict);
if (value) {
g_variant_unref(value);
return TRUE;
} else
return FALSE;
return !!value;
}
/*****************************************************************************/