luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

array: use guint type for loop variable iterating over GPtrArray.len elements

Browse Source 
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.
This commit is contained in:
Thomas Haller 2020-05-07 08:15:44 +02:00
parent 3b3026b763
commit 507818aabd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/garray.c
View File

@ -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);