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

garray: Factor out implementation of g_ptr_array_remove_index*()

Browse Source 
They were almost identically the same. This introduces no functional
changes, but will help with upcoming additions to GPtrArray.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=795376
This commit is contained in:
Philip Withnall 2018-04-19 14:46:05 +01:00
parent 3e96523e6b
commit 2c9a84e5a3
1 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
glib/garray.c
View File

@ -1191,6 +1191,38 @@ g_ptr_array_set_size (GPtrArray *array,
rarray->len = length;
}
static gpointer
ptr_array_remove_index (GPtrArray *array,
guint index_,
gboolean fast)
{
GRealPtrArray *rarray = (GRealPtrArray *) array;
gpointer result;
g_return_val_if_fail (rarray, NULL);
g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL);
g_return_val_if_fail (index_ < rarray->len, NULL);
result = rarray->pdata[index_];
if (rarray->element_free_func != NULL)
rarray->element_free_func (rarray->pdata[index_]);
if (index_ != rarray->len - 1 && !fast)
memmove (rarray->pdata + index_, rarray->pdata + index_ + 1,
sizeof (gpointer) * (rarray->len - index_ - 1));
else if (index_ != rarray->len - 1)
rarray->pdata[index_] = rarray->pdata[rarray->len - 1];
rarray->len -= 1;
if (G_UNLIKELY (g_mem_gc_friendly))
rarray->pdata[rarray->len] = NULL;
return result;
}
/**
* g_ptr_array_remove_index:
* @array: a #GPtrArray
@ -1207,29 +1239,7 @@ gpointer
g_ptr_array_remove_index (GPtrArray *array,
guint index_)
{
GRealPtrArray *rarray = (GRealPtrArray *)array;
gpointer result;
g_return_val_if_fail (rarray, NULL);
g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL);
g_return_val_if_fail (index_ < rarray->len, NULL);
result = rarray->pdata[index_];
if (rarray->element_free_func != NULL)
rarray->element_free_func (rarray->pdata[index_]);
if (index_ != rarray->len - 1)
memmove (rarray->pdata + index_, rarray->pdata + index_ + 1,
sizeof (gpointer) * (rarray->len - index_ - 1));
rarray->len -= 1;
if (G_UNLIKELY (g_mem_gc_friendly))
rarray->pdata[rarray->len] = NULL;
return result;
return ptr_array_remove_index (array, index_, FALSE);
}
/**
@ -1249,28 +1259,7 @@ gpointer
g_ptr_array_remove_index_fast (GPtrArray *array,
guint index_)
{
GRealPtrArray *rarray = (GRealPtrArray *)array;
gpointer result;
g_return_val_if_fail (rarray, NULL);
g_return_val_if_fail (rarray->len == 0 || (rarray->len != 0 && rarray->pdata != NULL), NULL);
g_return_val_if_fail (index_ < rarray->len, NULL);
result = rarray->pdata[index_];
if (rarray->element_free_func != NULL)
rarray->element_free_func (rarray->pdata[index_]);
if (index_ != rarray->len - 1)
rarray->pdata[index_] = rarray->pdata[rarray->len - 1];
rarray->len -= 1;
if (G_UNLIKELY (g_mem_gc_friendly))
rarray->pdata[rarray->len] = NULL;
return result;
return ptr_array_remove_index (array, index_, TRUE);
}
/**