diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-01-10 19:50:14 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-01-11 11:50:25 +0100 |
| commit | d2f0e16ccd9462dc2de67994557900ad58315755 (patch) | |
| tree | ba668f660eb76c2523a9564c73b9a106e4c192e1 | |
| parent | 2e7aba2b4629826beab787968fbe6f51157e9b06 (diff) | |
| download | NetworkManager-d2f0e16ccd9462dc2de67994557900ad58315755.tar.gz | |
libnm: add _nm_sett_info_setting_get_property_info() helper
| -rw-r--r-- | libnm-core/nm-core-internal.h | 12 | ||||
| -rw-r--r-- | libnm-core/nm-setting.c | 29 |
2 files changed, 25 insertions, 16 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index d3e3ad39a4..6af293a013 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -707,10 +707,18 @@ _nm_sett_info_property_info_get_sorted (const NMSettInfoSetting *sett_info, : &sett_info->property_infos[idx]; } +const NMSettInfoProperty *_nm_sett_info_setting_get_property_info (const NMSettInfoSetting *sett_info, + const char *property_name); + const NMSettInfoSetting *_nm_setting_class_get_sett_info (NMSettingClass *setting_class); -const NMSettInfoProperty *_nm_setting_class_get_property_info (NMSettingClass *setting_class, - const char *property_name); +static inline const NMSettInfoProperty * +_nm_setting_class_get_property_info (NMSettingClass *setting_class, + const char *property_name) +{ + return _nm_sett_info_setting_get_property_info (_nm_setting_class_get_sett_info (setting_class), + property_name); +} /*****************************************************************************/ diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 8f2a789974..cfd95a2d3e 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -508,25 +508,15 @@ _nm_setting_class_commit_full (NMSettingClass *setting_class, setting_class); } -const NMSettInfoSetting * -_nm_setting_class_get_sett_info (NMSettingClass *setting_class) -{ - if ( NM_IS_SETTING_CLASS (setting_class) - && setting_class->setting_info) { - nm_assert (setting_class->setting_info->meta_type < G_N_ELEMENTS (_sett_info_settings)); - return &_sett_info_settings[setting_class->setting_info->meta_type]; - } - return NULL; -} - const NMSettInfoProperty * -_nm_setting_class_get_property_info (NMSettingClass *setting_class, - const char *property_name) +_nm_sett_info_setting_get_property_info (const NMSettInfoSetting *sett_info, + const char *property_name) { - const NMSettInfoSetting *sett_info = _nm_setting_class_get_sett_info (setting_class); const NMSettInfoProperty *property; gssize idx; + nm_assert (property_name); + if (!sett_info) return NULL; @@ -549,6 +539,17 @@ _nm_setting_class_get_property_info (NMSettingClass *setting_class, return property; } +const NMSettInfoSetting * +_nm_setting_class_get_sett_info (NMSettingClass *setting_class) +{ + if ( NM_IS_SETTING_CLASS (setting_class) + && setting_class->setting_info) { + nm_assert (setting_class->setting_info->meta_type < G_N_ELEMENTS (_sett_info_settings)); + return &_sett_info_settings[setting_class->setting_info->meta_type]; + } + return NULL; +} + /*****************************************************************************/ gboolean |