summaryrefslogtreecommitdiff
path: root/src/nm-auth-utils.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-04-10 14:34:30 +0200
committerThomas Haller <thaller@redhat.com>2018-04-13 09:09:46 +0200
commit457b08bbb6a0b19ecc05af57f8cb29ee974c8fe9 (patch)
tree090d7f6ef17e4a9da2b8d116f2222f11fae6da91 /src/nm-auth-utils.c
parentc05088a09b847c750f4ad8144f26a6273090ec4d (diff)
downloadNetworkManager-457b08bbb6a0b19ecc05af57f8cb29ee974c8fe9.tar.gz
auth-chain/trivial: rename data field in NMAuthChain
We already use "data" for other places. Let's use unique names that can be searched within one file.
Diffstat (limited to 'src/nm-auth-utils.c')
-rw-r--r--src/nm-auth-utils.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index 4d268d0025..66daeede3a 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -34,7 +34,7 @@
/*****************************************************************************/
struct NMAuthChain {
- GHashTable *data;
+ GHashTable *data_hash;
CList auth_call_lst_head;
@@ -119,7 +119,7 @@ _get_data (NMAuthChain *self, const char *tag)
{
ChainData *tmp;
- tmp = g_hash_table_lookup (self->data, &tag);
+ tmp = g_hash_table_lookup (self->data_hash, &tag);
return tmp ? tmp->data : NULL;
}
@@ -152,7 +152,7 @@ nm_auth_chain_steal_data (NMAuthChain *self, const char *tag)
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (tag, NULL);
- tmp = g_hash_table_lookup (self->data, &tag);
+ tmp = g_hash_table_lookup (self->data_hash, &tag);
if (!tmp)
return NULL;
@@ -160,7 +160,7 @@ nm_auth_chain_steal_data (NMAuthChain *self, const char *tag)
/* Make sure the destroy handler isn't called when freeing */
tmp->destroy = NULL;
- g_hash_table_remove (self->data, tmp);
+ g_hash_table_remove (self->data_hash, tmp);
return value;
}
@@ -174,9 +174,9 @@ nm_auth_chain_set_data (NMAuthChain *self,
g_return_if_fail (tag);
if (data == NULL)
- g_hash_table_remove (self->data, &tag);
+ g_hash_table_remove (self->data_hash, &tag);
else {
- g_hash_table_add (self->data,
+ g_hash_table_add (self->data_hash,
chain_data_new (tag, data, data_destroy));
}
}
@@ -331,7 +331,7 @@ nm_auth_chain_new_subject (NMAuthSubject *subject,
self = g_slice_new0 (NMAuthChain);
c_list_init (&self->auth_call_lst_head);
self->refcount = 1;
- self->data = g_hash_table_new_full (nm_pstr_hash, nm_pstr_equal, NULL, chain_data_free);
+ self->data_hash = g_hash_table_new_full (nm_pstr_hash, nm_pstr_equal, NULL, chain_data_free);
self->done_func = done_func;
self->user_data = user_data;
self->context = context ? g_object_ref (context) : NULL;
@@ -369,7 +369,7 @@ nm_auth_chain_destroy (NMAuthChain *self)
while ((call = c_list_first_entry (&self->auth_call_lst_head, AuthCall, auth_call_lst)))
auth_call_free (call);
- nm_clear_pointer (&self->data, g_hash_table_destroy);
+ nm_clear_pointer (&self->data_hash, g_hash_table_destroy);
g_slice_free (NMAuthChain, self);
}