diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-01 10:50:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-05 17:12:50 +0200 |
| commit | ced1dcabefdf8663e034822d8773aa79a071a043 (patch) | |
| tree | ab3ac067ee728c71960f20bf6e6d51369111e4c5 | |
| parent | d5bfe04dea290ce288b8fe141a20c66ad6588e55 (diff) | |
| download | NetworkManager-ced1dcabefdf8663e034822d8773aa79a071a043.tar.gz | |
config/trivial: rename nm_config_get_device_match_spec() to nm_config_get_match_spec()
We want to use the term match-spec more generally and not only
for "device-specs".
| -rw-r--r-- | src/nm-config-data.c | 14 | ||||
| -rw-r--r-- | src/nm-config.c | 2 | ||||
| -rw-r--r-- | src/nm-config.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 02467c53d7..a9b9891e46 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1087,10 +1087,10 @@ _get_connection_info_init (ConnectionInfo *connection_info, GKeyFile *keyfile, c /* pass ownership of @group on... */ connection_info->group_name = group; - connection_info->match_device.spec = nm_config_get_device_match_spec (keyfile, - group, - "match-device", - &connection_info->match_device.has); + connection_info->match_device.spec = nm_config_get_match_spec (keyfile, + group, + "match-device", + &connection_info->match_device.has); connection_info->stop_match = nm_config_keyfile_get_boolean (keyfile, group, "stop-match", FALSE); } @@ -1362,10 +1362,10 @@ constructed (GObject *object) priv->dns_mode = nm_strstrip (g_key_file_get_string (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "dns", NULL)); priv->rc_manager = nm_strstrip (g_key_file_get_string (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "rc-manager", NULL)); - priv->ignore_carrier = nm_config_get_device_match_spec (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "ignore-carrier", NULL); - priv->assume_ipv6ll_only = nm_config_get_device_match_spec (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "assume-ipv6ll-only", NULL); + priv->ignore_carrier = nm_config_get_match_spec (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "ignore-carrier", NULL); + priv->assume_ipv6ll_only = nm_config_get_match_spec (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "assume-ipv6ll-only", NULL); - priv->no_auto_default.specs_config = nm_config_get_device_match_spec (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "no-auto-default", NULL); + priv->no_auto_default.specs_config = nm_config_get_match_spec (priv->keyfile, NM_CONFIG_KEYFILE_GROUP_MAIN, "no-auto-default", NULL); priv->global_dns = load_global_dns (priv->keyfile_user, FALSE); if (!priv->global_dns) diff --git a/src/nm-config.c b/src/nm-config.c index f2b72e3a57..e09ec48ecd 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1416,7 +1416,7 @@ intern_config_write (const char *filename, /************************************************************************/ GSList * -nm_config_get_device_match_spec (const GKeyFile *keyfile, const char *group, const char *key, gboolean *out_has_key) +nm_config_get_match_spec (const GKeyFile *keyfile, const char *group, const char *key, gboolean *out_has_key) { gs_free char *value = NULL; diff --git a/src/nm-config.h b/src/nm-config.h index 0e96c3e85c..46b2ac85ff 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -143,7 +143,7 @@ void nm_config_keyfile_set_string_list (GKeyFile *keyfile, const char *key, const char *const* strv, gssize len); -GSList *nm_config_get_device_match_spec (const GKeyFile *keyfile, const char *group, const char *key, gboolean *out_has_key); +GSList *nm_config_get_match_spec (const GKeyFile *keyfile, const char *group, const char *key, gboolean *out_has_key); void _nm_config_sort_groups (char **groups, gsize ngroups); |