fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 10:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: drop NMSettingClass.compare_property()

Browse source
This commit is contained in:
Thomas Haller 2021-06-29 16:58:21 +02:00
parent 243459dc3a
commit b78fb1c615
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libnm-core-impl/nm-setting-private.h
View file

@ -75,19 +75,7 @@ struct _NMSettingClass {
NMSettingClearSecretsWithFlagsFn func,
gpointer user_data);
/* compare_property() returns a ternary, where DEFAULT means that the property should not
* be compared due to the compare @flags. A TRUE/FALSE result means that the property is
* equal/not-equal.
*
* @other may be %NULL, in which case the function only determines whether
* the setting should be compared (TRUE) or not (DEFAULT). */
NMTernary (*compare_property)(const struct _NMSettInfoSetting *sett_info,
const NMSettInfoProperty * property_info,
NMConnection * con_a,
NMSetting * set_a,
NMConnection * con_b,
NMSetting * set_b,
NMSettingCompareFlags flags);
void (*padding_1)(void);
void (*duplicate_copy_properties)(const struct _NMSettInfoSetting *sett_info,
NMSetting * src,

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

@ -1722,21 +1722,6 @@ _nm_setting_property_compare_fcn_default(const NMSettInfoSetting * sett_info,
NMConnection * con_b,
NMSetting * set_b,
NMSettingCompareFlags flags)
{
/* For the moment, the default implementation delegates to NMSettingClass.compare_property().
* That will change. */
return NM_SETTING_GET_CLASS(set_a)
->compare_property(sett_info, property_info, con_a, set_a, con_b, set_b, flags);
}
static NMTernary
compare_property(const NMSettInfoSetting * sett_info,
const NMSettInfoProperty *property_info,
NMConnection * con_a,
NMSetting * set_a,
NMConnection * con_b,
NMSetting * set_b,
NMSettingCompareFlags flags)
{
const GParamSpec *param_spec = property_info->param_spec;
@ -3283,7 +3268,6 @@ nm_setting_class_init(NMSettingClass *setting_class)
setting_class->update_one_secret = update_one_secret;
setting_class->get_secret_flags = get_secret_flags;
setting_class->set_secret_flags = set_secret_flags;
setting_class->compare_property = compare_property;
setting_class->clear_secrets = clear_secrets;
setting_class->for_each_secret = for_each_secret;
setting_class->duplicate_copy_properties = duplicate_copy_properties;