[glib/th/g-ptr-array-variable-cleanups: 1/2] array: use guint type for loop variable iterating over GPtrArray.len elements
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/th/g-ptr-array-variable-cleanups: 1/2] array: use guint type for loop variable iterating over GPtrArray.len elements
- Date: Thu, 7 May 2020 07:08:14 +0000 (UTC)
commit 507818aabd5167fdea1ce083a97cf937955c817d
Author: Thomas Haller <thaller redhat com>
Date: Thu May 7 08:15:44 2020 +0200
array: use guint type for loop variable iterating over GPtrArray.len elements
GPtrArray.len is guint. The type of the loop variable should match.
While at it, move some of the variables closer to the scope where they are
used.
glib/garray.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/glib/garray.c b/glib/garray.c
index be482335a..668292307 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -1186,7 +1186,6 @@ g_ptr_array_copy (GPtrArray *array,
GCopyFunc func,
gpointer user_data)
{
- gsize i;
GPtrArray *new_array;
g_return_val_if_fail (array != NULL, NULL);
@@ -1196,6 +1195,8 @@ g_ptr_array_copy (GPtrArray *array,
if (func != NULL)
{
+ guint i;
+
for (i = 0; i < array->len; i++)
new_array->pdata[i] = func (array->pdata[i], user_data);
}
@@ -1458,7 +1459,8 @@ ptr_array_free (GPtrArray *array,
gpointer *stolen_pdata = g_steal_pointer (&rarray->pdata);
if (rarray->element_free_func != NULL)
{
- gsize i;
+ guint i;
+
for (i = 0; i < rarray->len; ++i)
rarray->element_free_func (stolen_pdata[i]);
}
@@ -1840,7 +1842,6 @@ g_ptr_array_extend (GPtrArray *array_to_extend,
gpointer user_data)
{
GRealPtrArray *rarray_to_extend = (GRealPtrArray *) array_to_extend;
- gsize i;
g_return_if_fail (array_to_extend != NULL);
g_return_if_fail (array != NULL);
@@ -1849,6 +1850,8 @@ g_ptr_array_extend (GPtrArray *array_to_extend,
if (func != NULL)
{
+ guint i;
+
for (i = 0; i < array->len; i++)
rarray_to_extend->pdata[i + rarray_to_extend->len] =
func (array->pdata[i], user_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]