luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-08 10:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'th/g-ptr-array-variable-cleanups' into 'master'

Browse Source 
[th/g-ptr-array-variable-cleanups] minor cleanup of variables for GPtrArray

See merge request GNOME/glib!1482
This commit is contained in:
Philip Withnall
2020-05-07 09:10:19 +00:00
parent f9ab23465e cf1263bbb9
commit 9d34514f7d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
glib/garray.c
View File

@@ -1186,7 +1186,6 @@ g_ptr_array_copy (GPtrArray *array,
GCopyFunc func, GCopyFunc func,
gpointer user_data) gpointer user_data)
{ {
gsize i;
GPtrArray *new_array; GPtrArray *new_array;
g_return_val_if_fail (array != NULL, NULL); g_return_val_if_fail (array != NULL, NULL);
@@ -1196,6 +1195,8 @@ g_ptr_array_copy (GPtrArray *array,
if (func != NULL) if (func != NULL)
{ {
guint i;
for (i = 0; i < array->len; i++) for (i = 0; i < array->len; i++)
new_array->pdata[i] = func (array->pdata[i], user_data); 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); gpointer *stolen_pdata = g_steal_pointer (&rarray->pdata);
if (rarray->element_free_func != NULL) if (rarray->element_free_func != NULL)
{ {
gsize i; guint i;
for (i = 0; i < rarray->len; ++i) for (i = 0; i < rarray->len; ++i)
rarray->element_free_func (stolen_pdata[i]); rarray->element_free_func (stolen_pdata[i]);
} }
@@ -1683,7 +1685,7 @@ g_ptr_array_remove_range (GPtrArray *array,
guint length) guint length)
{ {
GRealPtrArray *rarray = (GRealPtrArray *)array; GRealPtrArray *rarray = (GRealPtrArray *)array;
guint n; guint i;
g_return_val_if_fail (rarray != NULL, NULL); g_return_val_if_fail (rarray != NULL, NULL);
g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL); g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL);
@@ -1692,8 +1694,8 @@ g_ptr_array_remove_range (GPtrArray *array,
if (rarray->element_free_func != NULL) if (rarray->element_free_func != NULL)
{ {
for (n = index_; n < index_ + length; n++) for (i = index_; i < index_ + length; i++)
rarray->element_free_func (rarray->pdata[n]); rarray->element_free_func (rarray->pdata[i]);
} }
if (index_ + length != rarray->len) if (index_ + length != rarray->len)
@@ -1706,7 +1708,6 @@ g_ptr_array_remove_range (GPtrArray *array,
rarray->len -= length; rarray->len -= length;
if (G_UNLIKELY (g_mem_gc_friendly)) if (G_UNLIKELY (g_mem_gc_friendly))
{ {
guint i;
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
rarray->pdata[rarray->len + i] = NULL; rarray->pdata[rarray->len + i] = NULL;
} }
@@ -1840,7 +1841,6 @@ g_ptr_array_extend (GPtrArray *array_to_extend,
gpointer user_data) gpointer user_data)
{ {
GRealPtrArray *rarray_to_extend = (GRealPtrArray *) array_to_extend; GRealPtrArray *rarray_to_extend = (GRealPtrArray *) array_to_extend;
gsize i;
g_return_if_fail (array_to_extend != NULL); g_return_if_fail (array_to_extend != NULL);
g_return_if_fail (array != NULL); g_return_if_fail (array != NULL);
@@ -1849,6 +1849,8 @@ g_ptr_array_extend (GPtrArray *array_to_extend,
if (func != NULL) if (func != NULL)
{ {
guint i;
for (i = 0; i < array->len; i++) for (i = 0; i < array->len; i++)
rarray_to_extend->pdata[i + rarray_to_extend->len] = rarray_to_extend->pdata[i + rarray_to_extend->len] =
func (array->pdata[i], user_data); func (array->pdata[i], user_data);