From 96d9baacdb1b8f0b903071e62b4044315dd92b7f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 20 May 2021 20:39:38 +0200
Subject: [PATCH] glib-aux/trivial: rename nm_{pint,puint32}_equals() to
 nm_\1_equal()

Our "_equal()" methods are commonly spelled without 's'.
---
 src/core/dns/nm-dns-manager.c        | 2 +-
 src/core/nm-l3cfg.c                  | 2 +-
 src/core/nm-netns.c                  | 4 ++--
 src/libnm-glib-aux/nm-hash-utils.c   | 2 +-
 src/libnm-glib-aux/nm-hash-utils.h   | 6 +++---
 src/libnm-glib-aux/nm-shared-utils.c | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index a4bf61ae1c..f161b14c0d 100644
--- a/src/core/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
@@ -2530,7 +2530,7 @@ nm_dns_manager_init(NMDnsManager *self)
 
     G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMDnsConfigData, ifindex) == 0);
     priv->configs_dict = g_hash_table_new_full(nm_pint_hash,
-                                               nm_pint_equals,
+                                               nm_pint_equal,
                                                (GDestroyNotify) _dns_config_data_free,
                                                NULL);
 
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 9b3c1ba7d5..835192a7f2 100644
--- a/src/core/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
@@ -1479,7 +1479,7 @@ _l3_acd_data_add(NML3Cfg *             self,
     if (!acd_data) {
         if (G_UNLIKELY(!self->priv.p->acd_lst_hash)) {
             G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(AcdData, info.addr) == 0);
-            self->priv.p->acd_lst_hash = g_hash_table_new(nm_puint32_hash, nm_puint32_equals);
+            self->priv.p->acd_lst_hash = g_hash_table_new(nm_puint32_hash, nm_puint32_equal);
         }
 
         acd_data  = g_slice_new(AcdData);
diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c
index 90728e7a1f..d5a0317df0 100644
--- a/src/core/nm-netns.c
+++ b/src/core/nm-netns.c
@@ -263,7 +263,7 @@ nm_netns_shared_ip_reserve(NMNetns *self)
 
     if (!priv->shared_ips) {
         addr             = addr_start;
-        priv->shared_ips = g_hash_table_new(nm_puint32_hash, nm_puint32_equals);
+        priv->shared_ips = g_hash_table_new(nm_puint32_hash, nm_puint32_equal);
         g_object_ref(self);
     } else {
         guint32 count;
@@ -392,7 +392,7 @@ constructed(GObject *object)
     if (!priv->platform)
         g_return_if_reached();
 
-    priv->l3cfgs = g_hash_table_new_full(nm_pint_hash, nm_pint_equals, _l3cfg_data_free, NULL);
+    priv->l3cfgs = g_hash_table_new_full(nm_pint_hash, nm_pint_equal, _l3cfg_data_free, NULL);
 
     priv->platform_netns = nm_platform_netns_get(priv->platform);
 
diff --git a/src/libnm-glib-aux/nm-hash-utils.c b/src/libnm-glib-aux/nm-hash-utils.c
index fa867c11c5..10fc097cc3 100644
--- a/src/libnm-glib-aux/nm-hash-utils.c
+++ b/src/libnm-glib-aux/nm-hash-utils.c
@@ -194,7 +194,7 @@ nm_pint_hash(gconstpointer p)
 }
 
 gboolean
-nm_pint_equals(gconstpointer a, gconstpointer b)
+nm_pint_equal(gconstpointer a, gconstpointer b)
 {
     const int *s1 = a;
     const int *s2 = a;
diff --git a/src/libnm-glib-aux/nm-hash-utils.h b/src/libnm-glib-aux/nm-hash-utils.h
index 19092994aa..e79fb894eb 100644
--- a/src/libnm-glib-aux/nm-hash-utils.h
+++ b/src/libnm-glib-aux/nm-hash-utils.h
@@ -354,11 +354,11 @@ gboolean nm_pstr_equal(gconstpointer a, gconstpointer b);
  * that is, "const int *" types. */
 
 guint    nm_pint_hash(gconstpointer p);
-gboolean nm_pint_equals(gconstpointer a, gconstpointer b);
+gboolean nm_pint_equal(gconstpointer a, gconstpointer b);
 
 G_STATIC_ASSERT(sizeof(int) == sizeof(guint32));
-#define nm_puint32_hash   nm_pint_hash
-#define nm_puint32_equals nm_pint_equals
+#define nm_puint32_hash  nm_pint_hash
+#define nm_puint32_equal nm_pint_equal
 
 /*****************************************************************************/
 
diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c
index 2da7402e23..91f525196f 100644
--- a/src/libnm-glib-aux/nm-shared-utils.c
+++ b/src/libnm-glib-aux/nm-shared-utils.c
@@ -5348,7 +5348,7 @@ nm_utils_g_main_context_create_integrate_source(GMainContext *inner_context)
     g_source_set_name(&ctx_src->source, "ContextIntegrateSource");
 
     ctx_src->context  = g_main_context_ref(inner_context);
-    ctx_src->fds      = g_hash_table_new_full(nm_pint_hash, nm_pint_equals, _poll_data_free, NULL);
+    ctx_src->fds      = g_hash_table_new_full(nm_pint_hash, nm_pint_equal, _poll_data_free, NULL);
     ctx_src->fds_len  = 0;
     ctx_src->fds_arr  = NULL;
     ctx_src->acquired = TRUE;