From 5ce91adeffca21f6cf43953a0421d2aaee49901b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 20 May 2021 20:39:38 +0200
Subject: [PATCH] libnm/trivial: rename _nm_keyfile_equals() to
 _nm_keyfile_equal()

---
 src/core/nm-config-data.c                   | 4 ++--
 src/core/nm-config.c                        | 2 +-
 src/libnm-core-impl/nm-keyfile-utils.c      | 6 +++---
 src/libnm-core-impl/tests/test-keyfile.c    | 4 ++--
 src/libnm-core-intern/nm-keyfile-internal.h | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c
index 94b099157c..f31c900e27 100644
--- a/src/core/nm-config-data.c
+++ b/src/core/nm-config-data.c
@@ -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),
diff --git a/src/core/nm-config.c b/src/core/nm-config.c
index 890ca093bb..74d8f4bf08 100644
--- a/src/core/nm-config.c
+++ b/src/core/nm-config.c
@@ -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");
diff --git a/src/libnm-core-impl/nm-keyfile-utils.c b/src/libnm-core-impl/nm-keyfile-utils.c
index 9c4a981ae5..88f9c4f928 100644
--- a/src/libnm-core-impl/nm-keyfile-utils.c
+++ b/src/libnm-core-impl/nm-keyfile-utils.c
@@ -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);
     }
 }
 
diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c
index 2e5483e6aa..ba7d783bf7 100644
--- a/src/libnm-core-impl/tests/test-keyfile.c
+++ b/src/libnm-core-impl/tests/test-keyfile.c
@@ -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);
     }
 }
diff --git a/src/libnm-core-intern/nm-keyfile-internal.h b/src/libnm-core-intern/nm-keyfile-internal.h
index 5140d8eb7c..d8ccc60991 100644
--- a/src/libnm-core-intern/nm-keyfile-internal.h
+++ b/src/libnm-core-intern/nm-keyfile-internal.h
@@ -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);
 
 /*****************************************************************************/