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

ghash: Use realloc in place of alloc for key/value

Browse Source 
Minor simplification resulting in the removal of redundant alloc wrappers.
This commit is contained in:
Hans Petter Jansson 2018-07-30 15:08:49 +02:00
parent 194eef5f17
commit 9986395638
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/ghash.c
View File

@ -365,17 +365,7 @@ g_hash_table_set_shift_from_size (GHashTable *hash_table, gint size)
} }
static inline gpointer static inline gpointer
g_hash_table_alloc_key_or_value_array (guint size, gboolean is_big G_GNUC_UNUSED) g_hash_table_realloc_key_or_value_array (gpointer a, guint size, G_GNUC_UNUSED gboolean is_big)
{
#ifdef USE_SMALL_ARRAYS
return g_malloc0 (size * (is_big ? BIG_ENTRY_SIZE : SMALL_ENTRY_SIZE));
#else
return g_new0 (gpointer, size);
#endif
}
static inline gpointer
g_hash_table_realloc_key_or_value_array (gpointer a, guint size, gboolean is_big G_GNUC_UNUSED)
{ {
#ifdef USE_SMALL_ARRAYS #ifdef USE_SMALL_ARRAYS
return g_realloc (a, size * (is_big ? BIG_ENTRY_SIZE : SMALL_ENTRY_SIZE)); return g_realloc (a, size * (is_big ? BIG_ENTRY_SIZE : SMALL_ENTRY_SIZE));
@ -630,7 +620,7 @@ g_hash_table_remove_all_nodes (GHashTable *hash_table,
g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT); g_hash_table_set_shift (hash_table, HASH_TABLE_MIN_SHIFT);
if (!destruction) if (!destruction)
{ {
hash_table->keys = g_hash_table_alloc_key_or_value_array (hash_table->size, FALSE); hash_table->keys = g_hash_table_realloc_key_or_value_array (NULL, hash_table->size, FALSE);
hash_table->values = hash_table->keys; hash_table->values = hash_table->keys;
hash_table->hashes = g_new0 (guint, hash_table->size); hash_table->hashes = g_new0 (guint, hash_table->size);
} }
@ -1037,7 +1027,7 @@ g_hash_table_new_full (GHashFunc hash_func,
#endif #endif
hash_table->key_destroy_func = key_destroy_func; hash_table->key_destroy_func = key_destroy_func;
hash_table->value_destroy_func = value_destroy_func; hash_table->value_destroy_func = value_destroy_func;
hash_table->keys = g_hash_table_alloc_key_or_value_array (hash_table->size, FALSE); hash_table->keys = g_hash_table_realloc_key_or_value_array (NULL, hash_table->size, FALSE);
hash_table->values = hash_table->keys; hash_table->values = hash_table->keys;
hash_table->hashes = g_new0 (guint, hash_table->size); hash_table->hashes = g_new0 (guint, hash_table->size);