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

Merge branch 'array-allocations' into 'master'

Browse Source 
garray: Optimise over-allocations with g_array_insert_vals()

See merge request GNOME/glib!53
This commit is contained in:
Christoph Reiter
2018-06-07 08:06:15 +00:00
parent 6f5c8f6f33 e1e8002998
commit bb92a03d68
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glib/garray.c
View File

@@ -546,7 +546,10 @@ g_array_insert_vals (GArray *farray,
/* Is the index off the end of the array, and hence do we need to over-allocate /* Is the index off the end of the array, and hence do we need to over-allocate
* and clear some elements? */ * and clear some elements? */
if (index_ >= array->len) if (index_ >= array->len)
{
g_array_maybe_expand (array, index_ - array->len + len);
return g_array_append_vals (g_array_set_size (farray, index_), data, len); return g_array_append_vals (g_array_set_size (farray, index_), data, len);
}
g_array_maybe_expand (array, len); g_array_maybe_expand (array, len);