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

libnm: add nm_setting_option_get_names()

Browse Source 
More general purpose API for generic options of settings.
This commit is contained in:
Thomas Haller
2020-05-14 09:16:33 +02:00
parent 150af44e10
commit 1a56a2105c
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libnm-core/nm-core-internal.h
View File

@@ -322,9 +322,6 @@ guint _nm_setting_option_get_all (NMSetting *setting,
const char *const**out_names, const char *const**out_names,
GVariant *const**out_values); GVariant *const**out_values);
const char *const*_nm_setting_option_get_all_names (NMSetting *setting,
guint *out_len);
gboolean _nm_setting_option_clear (NMSetting *setting, gboolean _nm_setting_option_clear (NMSetting *setting,
const char *optname); const char *optname);

12
libnm-core/nm-setting.c
View File

@@ -2482,23 +2482,21 @@ out_zero:
} }
/** /**
* _nm_setting_option_get_all_names: * nm_setting_option_get_all_names:
* @setting: the #NMSetting * @setting: the #NMSetting
* @out_len: (allow-none) (out): * @out_len: (allow-none) (out):
* *
* Gives the number of generic data elements and optionally returns all their * Gives the name of all set options.
* key names and values. This API is low level access and unless you know what you
* are doing, it might not be what you want.
* *
* Returns: (array length=out_len zero-terminated=1) (transfer none): * Returns: (array length=out_len zero-terminated=1) (transfer none):
* A %NULL terminated array of key names. If no names are present, this returns * A %NULL terminated array of key names. If no names are present, this returns
* %NULL. The returned array and the names are owned by %NMSetting and might be invalidated * %NULL. The returned array and the names are owned by %NMSetting and might be invalidated
* soon. * by the next operation.
* *
* Since: 1.14 * Since: 1.26
**/ **/
const char *const* const char *const*
_nm_setting_option_get_all_names (NMSetting *setting, nm_setting_option_get_all_names (NMSetting *setting,
guint *out_len) guint *out_len)
{ {
const char *const*names; const char *const*names;

4
libnm-core/nm-setting.h
View File

@@ -362,6 +362,10 @@ void nm_setting_option_set_boolean (NMSetting *setting,
const char *opt_name, const char *opt_name,
gboolean value); gboolean value);
NM_AVAILABLE_IN_1_26
const char *const*nm_setting_option_get_all_names (NMSetting *setting,
guint *out_len);
/*****************************************************************************/ /*****************************************************************************/
const GVariantType *nm_setting_get_dbus_property_type (NMSetting *setting, const GVariantType *nm_setting_get_dbus_property_type (NMSetting *setting,

1
libnm/libnm.ver
View File

@@ -1733,6 +1733,7 @@ global:
nm_setting_match_remove_kernel_command_line; nm_setting_match_remove_kernel_command_line;
nm_setting_match_remove_kernel_command_line_by_value; nm_setting_match_remove_kernel_command_line_by_value;
nm_setting_option_get; nm_setting_option_get;
nm_setting_option_get_all_names;
nm_setting_option_get_boolean; nm_setting_option_get_boolean;
nm_setting_option_get_uint32; nm_setting_option_get_uint32;
nm_setting_option_set; nm_setting_option_set;