luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-17 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mark the functions g_hash_table_freeze, g_hash_table_thaw and thus

Browse Source 
2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* ghash.c, gscanner.c, glib.h: Mark the functions
	g_hash_table_freeze, g_hash_table_thaw and thus
	g_scanner_freeze_symbol_table and g_scanner_thaw_symbol_table
	deprecated. They will issue an warning once, when compiled with
	G_ENABLE_DEBUG. This fixes Bug #3883. For discussion see
	http://mail.gnome.org/pipermail/gtk-devel-list/2000-April/003139.html
This commit is contained in:
Sebastian Wilhelmi
2000-07-20 16:06:33 +00:00
committed by Sebastian Wilhelmi
parent 5e4c5611ab
commit 84114c5321
14 changed files with 132 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
glib/ghash.c
View File

@@ -48,7 +48,6 @@ struct _GHashTable
{
gint size;
gint nnodes;
guint frozen;
GHashNode **nodes;
GHashFunc hash_func;
GCompareFunc key_compare_func;
@@ -80,7 +79,6 @@ g_hash_table_new (GHashFunc hash_func,
hash_table = g_new (GHashTable, 1);
hash_table->size = HASH_TABLE_MIN_SIZE;
hash_table->nnodes = 0;
hash_table->frozen = FALSE;
hash_table->hash_func = hash_func ? hash_func : g_direct_hash;
hash_table->key_compare_func = key_compare_func;
hash_table->nodes = g_new (GHashNode*, hash_table->size);
@@ -167,8 +165,7 @@ g_hash_table_insert (GHashTable *hash_table,
{
*node = g_hash_node_new (key, value);
hash_table->nnodes++;
if (!hash_table->frozen)
g_hash_table_resize (hash_table);
g_hash_table_resize (hash_table);
}
}
@@ -189,8 +186,7 @@ g_hash_table_remove (GHashTable *hash_table,
g_hash_node_destroy (dest);
hash_table->nnodes--;
if (!hash_table->frozen)
g_hash_table_resize (hash_table);
g_hash_table_resize (hash_table);
}
}
@@ -221,19 +217,20 @@ g_hash_table_lookup_extended (GHashTable *hash_table,
void
g_hash_table_freeze (GHashTable *hash_table)
{
g_return_if_fail (hash_table != NULL);
hash_table->frozen++;
#ifdef G_ENABLE_DEBUG
static gboolean first_call = TRUE;
if (first_call)
{
g_warning("g_hash_table_freeze and g_hash_table_thaw are deprecated.");
first_call = FALSE;
}
#endif /* G_ENABLE_DEBUG */
}
void
g_hash_table_thaw (GHashTable *hash_table)
{
g_return_if_fail (hash_table != NULL);
if (hash_table->frozen)
if (!(--hash_table->frozen))
g_hash_table_resize (hash_table);
}
guint
@@ -278,8 +275,7 @@ g_hash_table_foreach_remove (GHashTable *hash_table,
}
}
if (!hash_table->frozen)
g_hash_table_resize (hash_table);
g_hash_table_resize (hash_table);
return deleted;
}