fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-26 21:40:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: cleanup _properties_override_add*() functions

Browse source
This commit is contained in:
Thomas Haller 2019-09-22 15:23:41 +02:00
parent 275d850d1b
commit e5495c482f
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libnm-core/nm-setting-private.h
View file

@ -157,19 +157,30 @@ _nm_setting_class_commit (NMSettingClass *setting_class,
__VA_ARGS__ \
}))
void _properties_override_add_struct (GArray *properties_override,
const NMSettInfoProperty *prop_info);
gboolean _properties_override_add_assert (const NMSettInfoProperty *prop_info);
#define _properties_override_add(properties_override, \
...) \
(_properties_override_add_struct (properties_override, \
NM_SETT_INFO_PROPERTY (__VA_ARGS__)))
static inline void
_properties_override_add (GArray *properties_override,
const NMSettInfoProperty *prop_info)
{
nm_assert (properties_override);
nm_assert (_properties_override_add_assert (prop_info));
g_array_append_vals (properties_override, prop_info, 1);
}
#define _properties_override_add_gobj(properties_override, p_param_spec, p_property_type) \
_properties_override_add ((properties_override), .param_spec = (p_param_spec), .property_type = (p_property_type))
_properties_override_add ((properties_override), \
NM_SETT_INFO_PROPERTY ( \
.param_spec = (p_param_spec), \
.property_type = (p_property_type), \
))
#define _properties_override_add_virt(properties_override, p_name, p_property_type) \
_properties_override_add ((properties_override), .name = (p_name), .property_type = (p_property_type))
_properties_override_add ((properties_override), \
NM_SETT_INFO_PROPERTY ( \
.name = (""p_name""), \
.property_type = (p_property_type), \
))
/*****************************************************************************/

8
libnm-core/nm-setting.c
View file

@ -202,11 +202,9 @@ _gprop_to_dbus_fcn_flags (const GValue *val)
return g_variant_new_uint32 (g_value_get_flags (val));
}
void
_properties_override_add_struct (GArray *properties_override,
const NMSettInfoProperty *prop_info)
gboolean
_properties_override_add_assert (const NMSettInfoProperty *prop_info)
{
nm_assert (properties_override);
nm_assert (prop_info);
nm_assert ((!!prop_info->name) != (!!prop_info->param_spec));
nm_assert (!prop_info->param_spec || !prop_info->name || nm_streq0 (prop_info->name, prop_info->param_spec->name));
@ -230,7 +228,7 @@ _properties_override_add_struct (GArray *properties_override,
#undef _PROPERT_EXTRA
g_array_append_vals (properties_override, prop_info, 1);
return TRUE;
}
static NMSettInfoSetting _sett_info_settings[_NM_META_SETTING_TYPE_NUM];