colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auth-chain/trivial: rename data field in NMAuthChain

Browse Source 
We already use "data" for other places. Let's use unique names
that can be searched within one file.
This commit is contained in:
Thomas Haller
2018-04-10 14:34:30 +02:00
parent c05088a09b
commit 457b08bbb6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nm-auth-utils.c
View File

@@ -34,7 +34,7 @@
/*****************************************************************************/ /*****************************************************************************/
struct NMAuthChain { struct NMAuthChain {
GHashTable *data; GHashTable *data_hash;
CList auth_call_lst_head; CList auth_call_lst_head;
@@ -119,7 +119,7 @@ _get_data (NMAuthChain *self, const char *tag)
{ {
ChainData *tmp; ChainData *tmp;
tmp = g_hash_table_lookup (self->data, &tag); tmp = g_hash_table_lookup (self->data_hash, &tag);
return tmp ? tmp->data : NULL; 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 (self, NULL);
g_return_val_if_fail (tag, 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) if (!tmp)
return NULL; 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 */ /* Make sure the destroy handler isn't called when freeing */
tmp->destroy = NULL; tmp->destroy = NULL;
g_hash_table_remove (self->data, tmp); g_hash_table_remove (self->data_hash, tmp);
return value; return value;
} }
@@ -174,9 +174,9 @@ nm_auth_chain_set_data (NMAuthChain *self,
g_return_if_fail (tag); g_return_if_fail (tag);
if (data == NULL) if (data == NULL)
g_hash_table_remove (self->data, &tag); g_hash_table_remove (self->data_hash, &tag);
else { else {
g_hash_table_add (self->data, g_hash_table_add (self->data_hash,
chain_data_new (tag, data, data_destroy)); chain_data_new (tag, data, data_destroy));
} }
} }
@@ -331,7 +331,7 @@ nm_auth_chain_new_subject (NMAuthSubject *subject,
self = g_slice_new0 (NMAuthChain); self = g_slice_new0 (NMAuthChain);
c_list_init (&self->auth_call_lst_head); c_list_init (&self->auth_call_lst_head);
self->refcount = 1; 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->done_func = done_func;
self->user_data = user_data; self->user_data = user_data;
self->context = context ? g_object_ref (context) : NULL; 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))) while ((call = c_list_first_entry (&self->auth_call_lst_head, AuthCall, auth_call_lst)))
auth_call_free (call); 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); g_slice_free (NMAuthChain, self);
} }