colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: drop special casing G_TYPE_STRV from _nm_setting_class_commit()

Browse Source 
There are no such properties left. They now all use
_nm_setting_property_define_gprop_strv_oldstyle() and the
properties_override array already contains the properties.

This simplifies _nm_setting_class_commit() and moves logic away.

Note that most of the code in _nm_setting_class_commit() is only asserts
for consistency.

Since "properties_override" now contains all properties, it doesn't
really "override" any default and the name is bad. Anyway.
This commit is contained in:
Thomas Haller
2023-10-25 13:19:36 +02:00
parent 7113c0c67e
commit 2dd5b065a8
1 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/libnm-core-impl/nm-setting.c
View File

@@ -333,9 +333,11 @@ _nm_setting_class_commit(NMSettingClass *setting_class,
GArray *properties_override, GArray *properties_override,
gint16 private_offset) gint16 private_offset)
{ {
NMSettInfoSetting *sett_info; NMSettInfoSetting *sett_info;
gs_free GParamSpec **property_specs = NULL; #if NM_MORE_ASSERTS > 10
guint n_property_specs; gs_free GParamSpec **property_specs = NULL;
guint n_property_specs;
#endif
NMSettInfoPropertLookupByParamSpec *lookup_by_iter; NMSettInfoPropertLookupByParamSpec *lookup_by_iter;
guint override_len; guint override_len;
guint i; guint i;
@@ -352,11 +354,8 @@ _nm_setting_class_commit(NMSettingClass *setting_class,
nm_assert(!sett_info->property_infos_len); nm_assert(!sett_info->property_infos_len);
nm_assert(!sett_info->property_infos); nm_assert(!sett_info->property_infos);
property_specs =
g_object_class_list_properties(G_OBJECT_CLASS(setting_class), &n_property_specs);
if (!properties_override) if (!properties_override)
properties_override = _nm_sett_info_property_override_create_array_sized(n_property_specs); properties_override = _nm_sett_info_property_override_create_array_sized(1);
override_len = properties_override->len; override_len = properties_override->len;
@@ -375,6 +374,9 @@ _nm_setting_class_commit(NMSettingClass *setting_class,
} }
#if NM_MORE_ASSERTS > 10 #if NM_MORE_ASSERTS > 10
property_specs =
g_object_class_list_properties(G_OBJECT_CLASS(setting_class), &n_property_specs);
/* assert that properties_override is constructed consistently. */ /* assert that properties_override is constructed consistently. */
for (i = 0; i < override_len; i++) { for (i = 0; i < override_len; i++) {
const NMSettInfoProperty *p = &nm_g_array_index(properties_override, NMSettInfoProperty, i); const NMSettInfoProperty *p = &nm_g_array_index(properties_override, NMSettInfoProperty, i);
@@ -394,46 +396,31 @@ _nm_setting_class_commit(NMSettingClass *setting_class,
} }
nm_assert(found == (p->param_spec != NULL)); nm_assert(found == (p->param_spec != NULL));
} }
#endif
for (i = 0; i < n_property_specs; i++) { for (i = 0; i < n_property_specs; i++) {
const char *name = property_specs[i]->name; const GParamSpec *param_spec = property_specs[i];
NMSettInfoProperty *p; const char *name = param_spec->name;
const NMSettInfoProperty *p;
if (_nm_sett_info_property_find_in_array( p = _nm_sett_info_property_find_in_array(
nm_g_array_first_p(properties_override, NMSettInfoProperty), nm_g_array_first_p(properties_override, NMSettInfoProperty),
override_len, override_len,
name)) name);
continue; nm_assert(p);
nm_assert(p->param_spec);
p = nm_g_array_append_new(properties_override, NMSettInfoProperty); nm_assert(p->param_spec == param_spec);
memset(p, 0, sizeof(*p));
p->name = name;
p->param_spec = property_specs[i];
} }
for (i = 0; i < properties_override->len; i++) { for (i = 0; i < properties_override->len; i++) {
NMSettInfoProperty *p = &nm_g_array_index(properties_override, NMSettInfoProperty, i); NMSettInfoProperty *p = &nm_g_array_index(properties_override, NMSettInfoProperty, i);
GType vtype;
if (p->property_type)
goto has_property_type;
nm_assert(p->param_spec);
vtype = p->param_spec->value_type;
if (vtype == G_TYPE_STRV)
p->property_type = &nm_sett_info_propert_type_gprop_strv;
else
nm_assert_not_reached();
has_property_type:
nm_assert(p->property_type); nm_assert(p->property_type);
nm_assert(p->property_type->dbus_type); nm_assert(p->property_type->dbus_type);
nm_assert(g_variant_type_string_is_valid((const char *) p->property_type->dbus_type)); nm_assert(g_variant_type_string_is_valid((const char *) p->property_type->dbus_type));
nm_assert(p->name); nm_assert(p->name);
nm_assert(!p->param_spec || nm_streq0(p->name, p->param_spec->name));
} }
#endif
G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMSettInfoProperty, name) == 0); G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMSettInfoProperty, name) == 0);
g_array_sort(properties_override, nm_strcmp_p); g_array_sort(properties_override, nm_strcmp_p);