libnm: rename nm_setting_gendata_*() API to nm_setting_option_*()

We are going to expose some of this API in libnm.

The name "gendata" (for "generic data") is not very suited. Instead,
call the public API nm_setting_option_*(). This also brings no naming
conflict, because currently no API exists with such naming.

Rename the internal API, so that it matches the API that we are going
to expose next.

5 files changed, 58 insertions, 58 deletions

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index b64b4709b1..4493a47d85 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -310,35 +310,35 @@ gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue
 
 /*****************************************************************************/
 
-typedef gboolean (*nm_setting_gendata_filter_fcn)(const char *name);
+typedef gboolean (*NMSettingOptionFilterFcn)(const char *name);
 
-GHashTable *_nm_setting_gendata_hash (NMSetting *setting,
-                                      gboolean create_if_necessary);
+GHashTable *_nm_setting_option_hash (NMSetting *setting,
+                                     gboolean create_if_necessary);
 
-void _nm_setting_gendata_notify (NMSetting *setting,
-                                 gboolean keys_changed);
+void _nm_setting_option_notify (NMSetting *setting,
+                                gboolean keys_changed);
 
-guint _nm_setting_gendata_get_all (NMSetting *setting,
-                                   const char *const**out_names,
-                                   GVariant *const**out_values);
+guint _nm_setting_option_get_all (NMSetting *setting,
+                                  const char *const**out_names,
+                                  GVariant *const**out_values);
 
-GVariant *nm_setting_gendata_get (NMSetting *setting,
+GVariant *_nm_setting_option_get (NMSetting *setting,
                                   const char *name);
 
-const char *const*nm_setting_gendata_get_all_names (NMSetting *setting,
+const char *const*_nm_setting_option_get_all_names (NMSetting *setting,
                                                     guint *out_len);
 
-gboolean nm_setting_gendata_clear (NMSetting *setting,
+gboolean _nm_setting_option_clear (NMSetting *setting,
                                    const char *optname);
 
-gboolean nm_setting_gendata_clear_all (NMSetting *setting,
-                                       nm_setting_gendata_filter_fcn filter);
+gboolean _nm_setting_option_clear_all (NMSetting *setting,
+                                       NMSettingOptionFilterFcn filter);
 
-gboolean nm_setting_gendata_get_uint32 (NMSetting *setting,
+gboolean _nm_setting_option_get_uint32 (NMSetting *setting,
                                         const char *optname,
                                         guint32 *out_value);
 
-void nm_setting_gendata_set_uint32 (NMSetting *setting,
+void _nm_setting_option_set_uint32 (NMSetting *setting,
                                     const char *optname,
                                     guint32 value);
 
diff --git a/libnm-core/nm-setting-ethtool.c b/libnm-core/nm-setting-ethtool.c
index 82da6f969f..664b7d4d63 100644
--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@@ -115,7 +115,7 @@ G_DEFINE_TYPE (NMSettingEthtool, nm_setting_ethtool, NM_TYPE_SETTING)
 static void
 _notify_attributes (NMSettingEthtool *self)
 {
-	_nm_setting_gendata_notify (NM_SETTING (self), TRUE);
+	_nm_setting_option_notify (NM_SETTING (self), TRUE);
 }
 
 /*****************************************************************************/
@@ -145,7 +145,7 @@ nm_setting_ethtool_get_feature (NMSettingEthtool *setting,
 	g_return_val_if_fail (NM_IS_SETTING_ETHTOOL (setting), NM_TERNARY_DEFAULT);
 	g_return_val_if_fail (optname && nm_ethtool_optname_is_feature (optname), NM_TERNARY_DEFAULT);
 
-	v = nm_setting_gendata_get (NM_SETTING (setting), optname);
+	v = _nm_setting_option_get (NM_SETTING (setting), optname);
 	if (   v
 	    && g_variant_is_of_type (v, G_VARIANT_TYPE_BOOLEAN)) {
 		return g_variant_get_boolean (v)
@@ -183,8 +183,8 @@ nm_setting_ethtool_set_feature (NMSettingEthtool *setting,
 	                                    NM_TERNARY_FALSE,
 	                                    NM_TERNARY_TRUE));
 
-	hash = _nm_setting_gendata_hash (NM_SETTING (setting),
-	                                 value != NM_TERNARY_DEFAULT);
+	hash = _nm_setting_option_hash (NM_SETTING (setting),
+	                                value != NM_TERNARY_DEFAULT);
 
 	if (value == NM_TERNARY_DEFAULT) {
 		if (hash) {
@@ -226,7 +226,7 @@ nm_setting_ethtool_clear_features (NMSettingEthtool *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_ETHTOOL (setting));
 
-	if (nm_setting_gendata_clear_all (NM_SETTING (setting),
+	if (_nm_setting_option_clear_all (NM_SETTING (setting),
 	                                  &nm_ethtool_optname_is_feature))
 		_notify_attributes (setting);
 }
@@ -248,7 +248,7 @@ nm_setting_ethtool_init_features (NMSettingEthtool *setting,
 	for (i = 0; i < _NM_ETHTOOL_ID_FEATURE_NUM; i++)
 		requested[i] = NM_TERNARY_DEFAULT;
 
-	hash = _nm_setting_gendata_hash (NM_SETTING (setting), FALSE);
+	hash = _nm_setting_option_hash (NM_SETTING (setting), FALSE);
 	if (!hash)
 		return 0;
 
@@ -294,7 +294,7 @@ nm_setting_ethtool_get_coalesce (NMSettingEthtool *setting,
 	g_return_val_if_fail (NM_IS_SETTING_ETHTOOL (setting), FALSE);
 	g_return_val_if_fail (nm_ethtool_optname_is_coalesce (optname), FALSE);
 
-	return nm_setting_gendata_get_uint32 (NM_SETTING (setting),
+	return _nm_setting_option_get_uint32 (NM_SETTING (setting),
 	                                      optname,
 	                                      out_value);
 }
@@ -330,7 +330,7 @@ nm_setting_ethtool_set_coalesce (NMSettingEthtool *setting,
 	               NM_ETHTOOL_ID_COALESCE_ADAPTIVE_TX))
 		value = !!value;
 
-	nm_setting_gendata_set_uint32 (NM_SETTING (setting),
+	_nm_setting_option_set_uint32 (NM_SETTING (setting),
 	                               optname,
 	                               value);
 	_notify_attributes (setting);
@@ -352,7 +352,7 @@ nm_setting_ethtool_clear_coalesce (NMSettingEthtool *setting,
 	g_return_if_fail (NM_IS_SETTING_ETHTOOL (setting));
 	g_return_if_fail (nm_str_not_empty (optname));
 
-	if (nm_setting_gendata_clear (NM_SETTING (setting), optname))
+	if (_nm_setting_option_clear (NM_SETTING (setting), optname))
 		_notify_attributes (setting);
 }
 
@@ -369,7 +369,7 @@ nm_setting_ethtool_clear_coalesce_all (NMSettingEthtool *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_ETHTOOL (setting));
 
-	if (nm_setting_gendata_clear_all (NM_SETTING (setting),
+	if (_nm_setting_option_clear_all (NM_SETTING (setting),
 	                                  &nm_ethtool_optname_is_coalesce))
 		_notify_attributes (setting);
 }
@@ -398,7 +398,7 @@ nm_setting_ethtool_get_ring (NMSettingEthtool *setting,
 	g_return_val_if_fail (NM_IS_SETTING_ETHTOOL (setting), FALSE);
 	g_return_val_if_fail (nm_ethtool_optname_is_ring (optname), FALSE);
 
-	return nm_setting_gendata_get_uint32 (NM_SETTING (setting),
+	return _nm_setting_option_get_uint32 (NM_SETTING (setting),
 	                                      optname,
 	                                      out_value);
 }
@@ -429,7 +429,7 @@ nm_setting_ethtool_set_ring (NMSettingEthtool *setting,
 
 	g_return_if_fail (nm_ethtool_id_is_ring (ethtool_id));
 
-	nm_setting_gendata_set_uint32 (NM_SETTING (setting),
+	_nm_setting_option_set_uint32 (NM_SETTING (setting),
 	                               optname,
 	                               value);
 	_notify_attributes (setting);
@@ -451,7 +451,7 @@ nm_setting_ethtool_clear_ring (NMSettingEthtool *setting,
 	g_return_if_fail (NM_IS_SETTING_ETHTOOL (setting));
 	g_return_if_fail (nm_str_not_empty (optname));
 
-	if (nm_setting_gendata_clear (NM_SETTING (setting), optname))
+	if (_nm_setting_option_clear (NM_SETTING (setting), optname))
 		_notify_attributes (setting);
 }
 
@@ -468,7 +468,7 @@ nm_setting_ethtool_clear_ring_all (NMSettingEthtool *setting)
 {
 	g_return_if_fail (NM_IS_SETTING_ETHTOOL (setting));
 
-	if (nm_setting_gendata_clear_all (NM_SETTING (setting),
+	if (_nm_setting_option_clear_all (NM_SETTING (setting),
 	                                  &nm_ethtool_optname_is_ring))
 		_notify_attributes (setting);
 }
@@ -496,7 +496,7 @@ nm_setting_ethtool_get_optnames (NMSettingEthtool *setting,
 {
 	g_return_val_if_fail (NM_IS_SETTING_ETHTOOL (setting), NULL);
 
-	return nm_utils_strdict_get_keys (_nm_setting_gendata_hash (NM_SETTING (setting), FALSE),
+	return nm_utils_strdict_get_keys (_nm_setting_option_hash (NM_SETTING (setting), FALSE),
 	                                  TRUE,
 	                                  out_length);
 }
@@ -511,7 +511,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
 	const char *optname;
 	GVariant *variant;
 
-	hash = _nm_setting_gendata_hash (setting, FALSE);
+	hash = _nm_setting_option_hash (setting, FALSE);
 	if (!hash)
 		return TRUE;
 
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index ad050ee47b..c7cab45d29 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -715,7 +715,7 @@ _nm_setting_to_dbus (NMSetting *setting,
 
 	g_variant_builder_init (&builder, NM_VARIANT_TYPE_SETTING);
 
-	n_properties = _nm_setting_gendata_get_all (setting, &gendata_keys, NULL);
+	n_properties = _nm_setting_option_get_all (setting, &gendata_keys, NULL);
 	for (i = 0; i < n_properties; i++) {
 		g_variant_builder_add (&builder,
 		                       "{sv}",
@@ -873,7 +873,7 @@ init_from_dbus (NMSetting *setting,
 				g_hash_table_remove (keys, key);
 		}
 
-		_nm_setting_gendata_notify (setting, TRUE);
+		_nm_setting_option_notify (setting, TRUE);
 
 		/* Currently, only NMSettingEthtool supports gendata based options, and
 		 * that one has no other properties (except "name"). That means, we
@@ -1792,7 +1792,7 @@ nm_setting_enumerate_values (NMSetting *setting,
 		/* the properties of this setting are not real GObject properties.
 		 * Hence, this API makes little sense (or does it?). Still, call
 		 * @func with each value. */
-		n_properties = _nm_setting_gendata_get_all (setting, &names, NULL);
+		n_properties = _nm_setting_option_get_all (setting, &names, NULL);
 		if (n_properties > 0) {
 			gs_strfreev char **keys = g_strdupv ((char **) names);
 			GHashTable *h = _gendata_hash (setting, FALSE)->hash;
@@ -2389,7 +2389,7 @@ _gendata_hash (NMSetting *setting, gboolean create_if_necessary)
 }
 
 GHashTable *
-_nm_setting_gendata_hash (NMSetting *setting, gboolean create_if_necessary)
+_nm_setting_option_hash (NMSetting *setting, gboolean create_if_necessary)
 {
 	GenData *gendata;
 
@@ -2398,8 +2398,8 @@ _nm_setting_gendata_hash (NMSetting *setting, gboolean create_if_necessary)
 }
 
 void
-_nm_setting_gendata_notify (NMSetting *setting,
-                            gboolean names_changed)
+_nm_setting_option_notify (NMSetting *setting,
+                           gboolean names_changed)
 {
 	GenData *gendata;
 
@@ -2434,7 +2434,7 @@ out:
 }
 
 GVariant *
-nm_setting_gendata_get (NMSetting *setting,
+_nm_setting_option_get (NMSetting *setting,
                         const char *name)
 {
 	GenData *gendata;
@@ -2447,9 +2447,9 @@ nm_setting_gendata_get (NMSetting *setting,
 }
 
 guint
-_nm_setting_gendata_get_all (NMSetting *setting,
-                             const char *const**out_names,
-                             GVariant *const**out_values)
+_nm_setting_option_get_all (NMSetting *setting,
+                            const char *const**out_names,
+                            GVariant *const**out_values)
 {
 	GenData *gendata;
 	GHashTable *hash;
@@ -2495,7 +2495,7 @@ out_zero:
 }
 
 /**
- * nm_setting_gendata_get_all_names:
+ * _nm_setting_option_get_all_names:
  * @setting: the #NMSetting
  * @out_len: (allow-none) (out):
  *
@@ -2511,7 +2511,7 @@ out_zero:
  * Since: 1.14
  **/
 const char *const*
-nm_setting_gendata_get_all_names (NMSetting *setting,
+_nm_setting_option_get_all_names (NMSetting *setting,
                                   guint *out_len)
 {
 	const char *const*names;
@@ -2519,13 +2519,13 @@ nm_setting_gendata_get_all_names (NMSetting *setting,
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), NULL);
 
-	len = _nm_setting_gendata_get_all (setting, &names, NULL);
+	len = _nm_setting_option_get_all (setting, &names, NULL);
 	NM_SET_OUT (out_len, len);
 	return names;
 }
 
 gboolean
-nm_setting_gendata_get_uint32 (NMSetting *setting,
+_nm_setting_option_get_uint32 (NMSetting *setting,
                                const char *optname,
                                guint32 *out_value)
 {
@@ -2534,7 +2534,7 @@ nm_setting_gendata_get_uint32 (NMSetting *setting,
 	nm_assert (NM_IS_SETTING (setting));
 	nm_assert (nm_str_not_empty (optname));
 
-	v = nm_setting_gendata_get (setting, optname);
+	v = _nm_setting_option_get (setting, optname);
 	if (   v
 	    && g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32)) {
 		NM_SET_OUT (out_value, g_variant_get_uint32 (v));
@@ -2545,20 +2545,20 @@ nm_setting_gendata_get_uint32 (NMSetting *setting,
 }
 
 void
-nm_setting_gendata_set_uint32 (NMSetting *setting,
+_nm_setting_option_set_uint32 (NMSetting *setting,
                                const char *optname,
                                guint32 value)
 {
 	nm_assert (NM_IS_SETTING (setting));
 	nm_assert (nm_str_not_empty (optname));
 
-	g_hash_table_insert (_nm_setting_gendata_hash (setting, TRUE),
+	g_hash_table_insert (_nm_setting_option_hash (setting, TRUE),
 	                     g_strdup (optname),
 	                     g_variant_ref_sink (g_variant_new_uint32 (value)));
 }
 
 gboolean
-nm_setting_gendata_clear (NMSetting *setting,
+_nm_setting_option_clear (NMSetting *setting,
                           const char *optname)
 {
 	GHashTable *ht;
@@ -2566,7 +2566,7 @@ nm_setting_gendata_clear (NMSetting *setting,
 	nm_assert (NM_IS_SETTING (setting));
 	nm_assert (nm_str_not_empty (optname));
 
-	ht = _nm_setting_gendata_hash (setting, FALSE);
+	ht = _nm_setting_option_hash (setting, FALSE);
 	if (!ht)
 		return FALSE;
 
@@ -2574,8 +2574,8 @@ nm_setting_gendata_clear (NMSetting *setting,
 }
 
 gboolean
-nm_setting_gendata_clear_all (NMSetting *setting,
-                              nm_setting_gendata_filter_fcn filter)
+_nm_setting_option_clear_all (NMSetting *setting,
+                              NMSettingOptionFilterFcn filter)
 {
 	GHashTable *ht;
 	const char *name;
@@ -2584,7 +2584,7 @@ nm_setting_gendata_clear_all (NMSetting *setting,
 
 	nm_assert (NM_IS_SETTING (setting));
 
-	ht = _nm_setting_gendata_hash (setting, FALSE);
+	ht = _nm_setting_option_hash (setting, FALSE);
 	if (!ht)
 		return FALSE;
 
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c
index 372ae202e3..35de1a727f 100644
--- a/shared/nm-keyfile/nm-keyfile.c
+++ b/shared/nm-keyfile/nm-keyfile.c
@@ -3195,7 +3195,7 @@ _read_setting (KeyfileReaderInfo *info)
 		if (!keys)
 			n_keys = 0;
 		if (n_keys > 0) {
-			GHashTable *h = _nm_setting_gendata_hash (setting, TRUE);
+			GHashTable *h = _nm_setting_option_hash (setting, TRUE);
 
 			nm_utils_strv_sort (keys, n_keys);
 			for (k = 0; k < n_keys; k++) {
@@ -3851,10 +3851,10 @@ nm_keyfile_write (NMConnection *connection,
 
 			nm_assert (!nm_keyfile_plugin_get_alias_for_setting_name (sett_info->setting_class->setting_info->setting_name));
 
-			n_keys = _nm_setting_gendata_get_all (setting, &keys, NULL);
+			n_keys = _nm_setting_option_get_all (setting, &keys, NULL);
 
 			if (n_keys > 0) {
-				GHashTable *h = _nm_setting_gendata_hash (setting, FALSE);
+				GHashTable *h = _nm_setting_option_hash (setting, FALSE);
 
 				for (k = 0; k < n_keys; k++) {
 					const char *key = keys[k];
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index a1d83c26c2..e6fe97493a 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -909,7 +909,7 @@ _ethtool_coalesce_set (NMDevice *self,
 	nm_assert (ethtool_state);
 	nm_assert (!ethtool_state->coalesce);
 
-	hash = _nm_setting_gendata_hash (NM_SETTING (s_ethtool), FALSE);
+	hash = _nm_setting_option_hash (NM_SETTING (s_ethtool), FALSE);
 	if (!hash)
 		return;
 
@@ -967,7 +967,7 @@ _ethtool_init_ring (NMDevice *self,
 	nm_assert (ring);
 	nm_assert (NM_IS_SETTING_ETHTOOL (s_ethtool));
 
-	hash = _nm_setting_gendata_hash (NM_SETTING (s_ethtool), FALSE);
+	hash = _nm_setting_option_hash (NM_SETTING (s_ethtool), FALSE);
 	if (!hash)
 		return FALSE;