fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 23:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib-aux/trivial: rename nm_{pint,puint32}_equals() to nm_\1_equal()

Browse source 
Our "_equal()" methods are commonly spelled without 's'.
This commit is contained in:
Thomas Haller 2021-05-20 20:39:38 +02:00
parent 043cdda00b
commit 96d9baacdb
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/dns/nm-dns-manager.c
View file

@ -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);

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

@ -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);

4
src/core/nm-netns.c
View file

@ -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);

2
src/libnm-glib-aux/nm-hash-utils.c
View file

@ -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;

6
src/libnm-glib-aux/nm-hash-utils.h
View file

@ -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
/*****************************************************************************/

2
src/libnm-glib-aux/nm-shared-utils.c
View file

@ -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;