[glib/th/g-ptr-array-variable-cleanups: 2/2] array: combine loop variables in g_ptr_array_remove_range()
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/th/g-ptr-array-variable-cleanups: 2/2] array: combine loop variables in g_ptr_array_remove_range()
- Date: Thu, 7 May 2020 07:08:19 +0000 (UTC)
commit cf1263bbb90c7bb423e95f929fc0422d6100671b
Author: Thomas Haller <thaller redhat com>
Date: Thu May 7 08:33:57 2020 +0200
array: combine loop variables in g_ptr_array_remove_range()
glib/garray.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/glib/garray.c b/glib/garray.c
index 668292307..1fb5c3d64 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]