luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

insert/replace were identical except for a single line. Replace both with

Browse Source 
2007-11-27  Ryan Lortie  <desrt@desrt.ca>

        * glib/ghash.c (g_hash_table_insert, g_hash_table_replace,
        g_hash_table_insert_internal): insert/replace were identical except
        for a single line.  Replace both with a common function.


svn path=/trunk/; revision=5964
This commit is contained in:
Ryan Lortie 2007-11-28 03:40:39 +00:00 committed by Ryan Lortie
parent 53e58aafb7
commit 0adbacbff9
2 changed files with 45 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-11-27 Ryan Lortie <desrt@desrt.ca>
* glib/ghash.c (g_hash_table_insert, g_hash_table_replace,
g_hash_table_insert_internal): insert/replace were identical except
for a single line. Replace both with a common function.
2007-11-27 Alexander Larsson <alexl@redhat.com> 2007-11-27 Alexander Larsson <alexl@redhat.com>
* gio/Makefile.am: * gio/Makefile.am:

94
glib/ghash.c
View File

@ -322,6 +322,43 @@ g_hash_table_lookup_extended (GHashTable *hash_table,
return FALSE; return FALSE;
} }
static void
g_hash_table_insert_internal (GHashTable *hash_table,
gpointer key,
gpointer value,
gboolean keep_new_key)
{
GHashNode **node;
guint key_hash;
g_return_if_fail (hash_table != NULL);
g_return_if_fail (hash_table->ref_count > 0);
node = g_hash_table_lookup_node (hash_table, key, &key_hash);
if (*node)
{
if (hash_table->key_destroy_func)
{
if (keep_new_key)
hash_table->key_destroy_func ((*node)->key);
else
hash_table->key_destroy_func (key);
}
if (hash_table->value_destroy_func)
hash_table->value_destroy_func ((*node)->value);
(*node)->value = value;
}
else
{
*node = g_hash_node_new (key, value, key_hash);
hash_table->nnodes++;
G_HASH_TABLE_RESIZE (hash_table);
}
}
/** /**
* g_hash_table_insert: * g_hash_table_insert:
* @hash_table: a #GHashTable. * @hash_table: a #GHashTable.
@ -341,36 +378,7 @@ g_hash_table_insert (GHashTable *hash_table,
gpointer key, gpointer key,
gpointer value) gpointer value)
{ {
GHashNode **node; return g_hash_table_insert_internal (hash_table, key, value, FALSE);
guint key_hash;
g_return_if_fail (hash_table != NULL);
g_return_if_fail (hash_table->ref_count > 0);
node = g_hash_table_lookup_node (hash_table, key, &key_hash);
if (*node)
{
/* do not reset node->key in this place, keeping
* the old key is the intended behaviour.
* g_hash_table_replace() can be used instead.
*/
/* free the passed key */
if (hash_table->key_destroy_func)
hash_table->key_destroy_func (key);
if (hash_table->value_destroy_func)
hash_table->value_destroy_func ((*node)->value);
(*node)->value = value;
}
else
{
*node = g_hash_node_new (key, value, key_hash);
hash_table->nnodes++;
G_HASH_TABLE_RESIZE (hash_table);
}
} }
/** /**
@ -391,31 +399,7 @@ g_hash_table_replace (GHashTable *hash_table,
gpointer key, gpointer key,
gpointer value) gpointer value)
{ {
GHashNode **node; return g_hash_table_insert_internal (hash_table, key, value, TRUE);
guint key_hash;
g_return_if_fail (hash_table != NULL);
g_return_if_fail (hash_table->ref_count > 0);
node = g_hash_table_lookup_node (hash_table, key, &key_hash);
if (*node)
{
if (hash_table->key_destroy_func)
hash_table->key_destroy_func ((*node)->key);
if (hash_table->value_destroy_func)
hash_table->value_destroy_func ((*node)->value);
(*node)->key = key;
(*node)->value = value;
}
else
{
*node = g_hash_node_new (key, value, key_hash);
hash_table->nnodes++;
G_HASH_TABLE_RESIZE (hash_table);
}
} }
/** /**