From c72df50b6d4e9893e66ef90c4ec8cdec361728f9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 20 Dec 2017 22:41:08 +0100 Subject: libnm: reuse nm_utils_strdict_get_keys() to implement NMSettingVpn's get_keys() --- libnm-core/nm-setting-vpn.c | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index 339f2d47a7..a733f24dcc 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -155,39 +155,6 @@ nm_setting_vpn_get_persistent (NMSettingVpn *setting) return NM_SETTING_VPN_GET_PRIVATE (setting)->persistent; } -static const char ** -_get_keys (NMSettingVpn *setting, - gboolean is_secrets, - guint *out_length) -{ - NMSettingVpnPrivate *priv; - GHashTable *hash; - const char **keys; - guint len; - - nm_assert (NM_IS_SETTING_VPN (setting)); - - priv = NM_SETTING_VPN_GET_PRIVATE (setting); - - hash = is_secrets ? priv->secrets : priv->data; - - if (!g_hash_table_size (hash)) { - NM_SET_OUT (out_length, 0); - return NULL; - } - - keys = (const char **) g_hash_table_get_keys_as_array (hash, &len); - if (len > 1) { - g_qsort_with_data (keys, - len, - sizeof (const char *), - nm_strcmp_p_with_data, - NULL); - } - NM_SET_OUT (out_length, len); - return keys; -} - /** * nm_setting_vpn_get_num_data_items: * @setting: the #NMSettingVpn @@ -267,7 +234,9 @@ nm_setting_vpn_get_data_keys (NMSettingVpn *setting, { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL); - return _get_keys (setting, FALSE, out_length); + return nm_utils_strdict_get_keys (NM_SETTING_VPN_GET_PRIVATE (setting)->data, + TRUE, + out_length); } /** @@ -442,7 +411,9 @@ nm_setting_vpn_get_secret_keys (NMSettingVpn *setting, { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL); - return _get_keys (setting, TRUE, out_length); + return nm_utils_strdict_get_keys (NM_SETTING_VPN_GET_PRIVATE (setting)->secrets, + TRUE, + out_length); } /** -- cgit v1.2.1