fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 09:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm/trivial: rename _nm_keyfile_equals() to _nm_keyfile_equal()

Browse source
This commit is contained in:
Thomas Haller 2021-05-20 20:39:38 +02:00
parent 41a6e40bb9
commit 5ce91adeff
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/nm-config-data.c
View file

@ -1653,10 +1653,10 @@ nm_config_data_diff(NMConfigData *old_data, NMConfigData *new_data)
priv_old = NM_CONFIG_DATA_GET_PRIVATE(old_data);
priv_new = NM_CONFIG_DATA_GET_PRIVATE(new_data);
if (!_nm_keyfile_equals(priv_old->keyfile_user, priv_new->keyfile_user, TRUE))
if (!_nm_keyfile_equal(priv_old->keyfile_user, priv_new->keyfile_user, TRUE))
changes |= NM_CONFIG_CHANGE_VALUES | NM_CONFIG_CHANGE_VALUES_USER;
if (!_nm_keyfile_equals(priv_old->keyfile_intern, priv_new->keyfile_intern, TRUE))
if (!_nm_keyfile_equal(priv_old->keyfile_intern, priv_new->keyfile_intern, TRUE))
changes |= NM_CONFIG_CHANGE_VALUES | NM_CONFIG_CHANGE_VALUES_INTERN;
if (!nm_streq0(nm_config_data_get_config_main_file(old_data),

2
src/core/nm-config.c
View file

@ -2110,7 +2110,7 @@ nm_config_set_values(NMConfig *self,
"");
}
if (!_nm_keyfile_equals(keyfile_intern_current, keyfile_new, TRUE))
if (!_nm_keyfile_equal(keyfile_intern_current, keyfile_new, TRUE))
new_data = nm_config_data_new_update_keyfile_intern(priv->config_data, keyfile_new);
_LOGD("set values(): %s", new_data ? "has changes" : "no changes");

6
src/libnm-core-impl/nm-keyfile-utils.c
View file

@ -417,7 +417,7 @@ _nm_keyfile_a_contains_all_in_b(GKeyFile *kf_a, GKeyFile *kf_b)
}
static gboolean
_nm_keyfile_equals_ordered(GKeyFile *kf_a, GKeyFile *kf_b)
_nm_keyfile_equal_ordered(GKeyFile *kf_a, GKeyFile *kf_b)
{
gs_strfreev char **groups = NULL;
gs_strfreev char **groups_b = NULL;
@ -468,13 +468,13 @@ _nm_keyfile_equals_ordered(GKeyFile *kf_a, GKeyFile *kf_b)
}
gboolean
_nm_keyfile_equals(GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order)
_nm_keyfile_equal(GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order)
{
if (!consider_order) {
return _nm_keyfile_a_contains_all_in_b(kf_a, kf_b)
&& _nm_keyfile_a_contains_all_in_b(kf_b, kf_a);
} else {
return _nm_keyfile_equals_ordered(kf_a, kf_b);
return _nm_keyfile_equal_ordered(kf_a, kf_b);
}
}

4
src/libnm-core-impl/tests/test-keyfile.c
View file

@ -237,7 +237,7 @@ _keyfile_convert(NMConnection ** con,
c0_k1_c2 = _nm_keyfile_read(c0_k1, keyfile_name, read_handler, read_data, FALSE);
c0_k1_c2_k3 = _nm_keyfile_write(c0_k1_c2, write_handler, write_data);
g_assert(_nm_keyfile_equals(c0_k1, c0_k1_c2_k3, TRUE));
g_assert(_nm_keyfile_equal(c0_k1, c0_k1_c2_k3, TRUE));
}
if (k0) {
NMSetting8021x *s1, *s2;
@ -302,7 +302,7 @@ _keyfile_convert(NMConnection ** con,
else {
/* finally, if both a keyfile and a connection are given, assert that they are equal
* after a round of conversion. */
g_assert(_nm_keyfile_equals(c0_k1, k0_c1_k2, TRUE));
g_assert(_nm_keyfile_equal(c0_k1, k0_c1_k2, TRUE));
nmtst_assert_connection_equals(k0_c1, FALSE, c0_k1_c2, FALSE);
}
}

2
src/libnm-core-intern/nm-keyfile-internal.h
View file

@ -95,7 +95,7 @@ int nm_key_file_get_boolean(GKeyFile *kf, const char *group, const char *key, in
void _nm_keyfile_copy(GKeyFile *dst, GKeyFile *src);
gboolean _nm_keyfile_a_contains_all_in_b(GKeyFile *kf_a, GKeyFile *kf_b);
gboolean _nm_keyfile_equals(GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order);
gboolean _nm_keyfile_equal(GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order);
gboolean _nm_keyfile_has_values(GKeyFile *keyfile);
/*****************************************************************************/