From b78fb1c6153fd5ad151d4959b3988966005079bc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 29 Jun 2021 16:58:21 +0200 Subject: [PATCH] libnm: drop NMSettingClass.compare_property() --- src/libnm-core-impl/nm-setting-private.h | 14 +------------- src/libnm-core-impl/nm-setting.c | 16 ---------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/libnm-core-impl/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h index 0eb99c3783..43001b8b1f 100644 --- a/src/libnm-core-impl/nm-setting-private.h +++ b/src/libnm-core-impl/nm-setting-private.h @@ -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, diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index 762f0f1962..a16cd9da66 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -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;