From 0adbacbff90cdab1b96e3409b6d510a00916b586 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Wed, 28 Nov 2007 03:40:39 +0000 Subject: [PATCH] insert/replace were identical except for a single line. Replace both with 2007-11-27 Ryan Lortie * 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 --- ChangeLog | 6 ++++ glib/ghash.c | 94 ++++++++++++++++++++++------------------------------ 2 files changed, 45 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f7e33d67..7819d2f54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-27 Ryan Lortie + + * 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 * gio/Makefile.am: diff --git a/glib/ghash.c b/glib/ghash.c index 30dbce5e1..f65bebcce 100644 --- a/glib/ghash.c +++ b/glib/ghash.c @@ -322,6 +322,43 @@ g_hash_table_lookup_extended (GHashTable *hash_table, 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: * @hash_table: a #GHashTable. @@ -341,36 +378,7 @@ g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value) { - 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) - { - /* 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); - } + return g_hash_table_insert_internal (hash_table, key, value, FALSE); } /** @@ -391,31 +399,7 @@ g_hash_table_replace (GHashTable *hash_table, gpointer key, gpointer value) { - 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) - 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); - } + return g_hash_table_insert_internal (hash_table, key, value, TRUE); } /**