2010-05-04 Jonathan Chambers <joncham@gmail.com>

[mono.git] / eglib / src / gptrarray.c

diff --git a/eglib/src/gptrarray.c b/eglib/src/gptrarray.c
index 193bd7240bea33390c022bb836cb7b674c23672d..bfde715225590fdc0477c19ca86cf2792924cb63 100644 (file)
--- a/eglib/src/gptrarray.c
+++ b/eglib/src/gptrarray.c
@@ -38,7 +38,7 @@ typedef struct _GPtrArrayPriv {
 static void 
 g_ptr_array_grow(GPtrArrayPriv *array, guint length)
 {
-       gint new_length = array->len + length;
+       guint new_length = array->len + length;
 
        g_return_if_fail(array != NULL);
 
@@ -101,7 +101,7 @@ g_ptr_array_set_size(GPtrArray *array, gint length)
 {
        g_return_if_fail(array != NULL);
 
-       if(length > array->len) {
+       if((size_t)length > array->len) {
                g_ptr_array_grow((GPtrArrayPriv *)array, length);
                memset(array->pdata + array->len, 0, (length - array->len) 
                        * sizeof(gpointer));
@@ -139,6 +139,27 @@ g_ptr_array_remove_index(GPtrArray *array, guint index)
        return removed_node;
 }
 
+gpointer
+g_ptr_array_remove_index_fast(GPtrArray *array, guint index)
+{
+       gpointer removed_node;
+
+       g_return_val_if_fail(array != NULL, NULL);
+       g_return_val_if_fail(index >= 0 || index < array->len, NULL);
+
+       removed_node = array->pdata[index];
+
+       if(index != array->len - 1) {
+               g_memmove(array->pdata + index, array->pdata + array->len - 1,
+                       sizeof(gpointer));
+       }
+
+       array->len--;
+       array->pdata[array->len] = NULL;
+
+       return removed_node;
+}
+
 gboolean
 g_ptr_array_remove(GPtrArray *array, gpointer data)
 {
@@ -156,10 +177,31 @@ g_ptr_array_remove(GPtrArray *array, gpointer data)
        return FALSE;
 }
 
+gboolean
+g_ptr_array_remove_fast(GPtrArray *array, gpointer data)
+{
+       guint i;
+
+       g_return_val_if_fail(array != NULL, FALSE);
+
+       for(i = 0; i < array->len; i++) {
+               if(array->pdata[i] == data) {
+                       array->len--;
+                       if (array->len > 0)
+                               array->pdata [i] = array->pdata [array->len];
+                       else
+                               array->pdata [i] = NULL;
+                       return TRUE;
+               }
+       }
+
+       return FALSE;
+}
+
 void 
 g_ptr_array_foreach(GPtrArray *array, GFunc func, gpointer user_data)
 {
-       gint i;
+       guint i;
 
        for(i = 0; i < array->len; i++) {
                func(g_ptr_array_index(array, i), user_data);
@@ -180,3 +222,4 @@ g_ptr_array_sort_with_data(GPtrArray *array, GCompareDataFunc compare_func,
 }
 
 
+