luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 17:26:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

array: combine loop variables in g_ptr_array_remove_range()

Browse Source
This commit is contained in:
Thomas Haller 2020-05-07 08:33:57 +02:00
parent 507818aabd
commit cf1263bbb9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/garray.c
View File

@ -1685,7 +1685,7 @@ g_ptr_array_remove_range (GPtrArray *array,
guint length)
{
GRealPtrArray *rarray = (GRealPtrArray *)array;
guint n;
guint i;
g_return_val_if_fail (rarray != NULL, NULL);
g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL);
@ -1694,8 +1694,8 @@ g_ptr_array_remove_range (GPtrArray *array,
if (rarray->element_free_func != NULL)
{
for (n = index_; n < index_ + length; n++)
rarray->element_free_func (rarray->pdata[n]);
for (i = index_; i < index_ + length; i++)
rarray->element_free_func (rarray->pdata[i]);
}
if (index_ + length != rarray->len)
@ -1708,7 +1708,6 @@ g_ptr_array_remove_range (GPtrArray *array,
rarray->len -= length;
if (G_UNLIKELY (g_mem_gc_friendly))
{
guint i;
for (i = 0; i < length; i++)
rarray->pdata[rarray->len + i] = NULL;
}