luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-14 19:55:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename 'node' to 'node_ptr' where appropriate

Browse Source 
2007-12-03  Ryan Lortie  <desrt@desrt.ca>

        * glib/ghash.c: rename 'node' to 'node_ptr' where appropriate


svn path=/trunk/; revision=6034
This commit is contained in:
Ryan Lortie 2007-12-04 03:46:31 +00:00 committed by Ryan Lortie
parent 00c2db4e4b
commit 8a38e16052
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-12-03 Ryan Lortie <desrt@desrt.ca>
* glib/ghash.c: rename 'node' to 'node_ptr' where appropriate
2007-12-03 Ryan Lortie <desrt@desrt.ca> 2007-12-03 Ryan Lortie <desrt@desrt.ca>
* glib/ghash.c: convert G_HASH_TABLE_RESIZE() macro to inline function * glib/ghash.c: convert G_HASH_TABLE_RESIZE() macro to inline function

32
glib/ghash.c
View File

@ -222,11 +222,11 @@ g_hash_table_lookup_node (GHashTable *hash_table,
gconstpointer key, gconstpointer key,
guint *hash_return) guint *hash_return)
{ {
GHashNode **node; GHashNode **node_ptr;
guint hash_value; guint hash_value;
hash_value = (* hash_table->hash_func) (key); hash_value = (* hash_table->hash_func) (key);
node = &hash_table->nodes[hash_value % hash_table->size]; node_ptr = &hash_table->nodes[hash_value % hash_table->size];
if (hash_return) if (hash_return)
*hash_return = hash_value; *hash_return = hash_value;
@ -241,14 +241,14 @@ g_hash_table_lookup_node (GHashTable *hash_table,
* key equality function in most cases. * key equality function in most cases.
*/ */
if (hash_table->key_equal_func) if (hash_table->key_equal_func)
while (*node && (((*node)->key_hash != hash_value) || while (*node_ptr && (((*node_ptr)->key_hash != hash_value) ||
!(*hash_table->key_equal_func) ((*node)->key, key))) !(*hash_table->key_equal_func) ((*node_ptr)->key, key)))
node = &(*node)->next; node_ptr = &(*node_ptr)->next;
else else
while (*node && (*node)->key != key) while (*node_ptr && (*node_ptr)->key != key)
node = &(*node)->next; node_ptr = &(*node_ptr)->next;
return node; return node_ptr;
} }
/** /**
@ -320,21 +320,21 @@ g_hash_table_insert_internal (GHashTable *hash_table,
gpointer value, gpointer value,
gboolean keep_new_key) gboolean keep_new_key)
{ {
GHashNode **node; GHashNode **node_ptr;
guint key_hash; guint key_hash;
g_return_if_fail (hash_table != NULL); g_return_if_fail (hash_table != NULL);
g_return_if_fail (hash_table->ref_count > 0); g_return_if_fail (hash_table->ref_count > 0);
node = g_hash_table_lookup_node (hash_table, key, &key_hash); node_ptr = g_hash_table_lookup_node (hash_table, key, &key_hash);
if (*node) if (*node_ptr)
{ {
if (keep_new_key) if (keep_new_key)
{ {
if (hash_table->key_destroy_func) if (hash_table->key_destroy_func)
hash_table->key_destroy_func ((*node)->key); hash_table->key_destroy_func ((*node_ptr)->key);
(*node)->key = key; (*node_ptr)->key = key;
} }
else else
{ {
@ -343,13 +343,13 @@ g_hash_table_insert_internal (GHashTable *hash_table,
} }
if (hash_table->value_destroy_func) if (hash_table->value_destroy_func)
hash_table->value_destroy_func ((*node)->value); hash_table->value_destroy_func ((*node_ptr)->value);
(*node)->value = value; (*node_ptr)->value = value;
} }
else else
{ {
*node = g_hash_node_new (key, value, key_hash); *node_ptr = g_hash_node_new (key, value, key_hash);
hash_table->nnodes++; hash_table->nnodes++;
g_hash_table_maybe_resize (hash_table); g_hash_table_maybe_resize (hash_table);
} }