Do not remap framework assembly if it's version is higher than the runtime version

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

diff --git a/eglib/src/gptrarray.c b/eglib/src/gptrarray.c
index 193bd7240bea33390c022bb836cb7b674c23672d..d3e540733bd1c896a68f42fe372bb27f0e2b49eb 100644 (file)
--- a/eglib/src/gptrarray.c
+++ b/eglib/src/gptrarray.c
@@ -3,8 +3,10 @@
  *
  * Author:
  *   Aaron Bockover (abockover@novell.com)
+ *   Gonzalo Paniagua Javier (gonzalo@novell.com)
+ *   Jeffrey Stedfast (fejj@novell.com)
  *
- * (C) 2006 Novell, Inc.
+ * (C) 2006,2011 Novell, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -38,7 +40,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);
 
@@ -57,7 +59,7 @@ g_ptr_array_grow(GPtrArrayPriv *array, guint length)
 }
 
 GPtrArray *
-g_ptr_array_new()
+g_ptr_array_new(void)
 {
        return g_ptr_array_sized_new(0);
 }
@@ -101,7 +103,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));
@@ -124,7 +126,7 @@ g_ptr_array_remove_index(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);
+       g_return_val_if_fail(index < array->len, NULL);
 
        removed_node = array->pdata[index];
 
@@ -139,6 +141,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 < 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 +179,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);
@@ -167,16 +211,17 @@ g_ptr_array_foreach(GPtrArray *array, GFunc func, gpointer user_data)
 }
 
 void
-g_ptr_array_sort(GPtrArray *array, GCompareFunc compare_func)
+g_ptr_array_sort(GPtrArray *array, GCompareFunc compare)
 {
        g_return_if_fail(array != NULL);
-       qsort(array->pdata, array->len, sizeof(gpointer), compare_func);
+       qsort(array->pdata, array->len, sizeof(gpointer), compare);
 }
 
 void
-g_ptr_array_sort_with_data(GPtrArray *array, GCompareDataFunc compare_func, 
-       gpointer user_data)
+g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc compare, gpointer user_data)
 {
+       g_return_if_fail (array != NULL);
+       
+       g_qsort_with_data (array->pdata, array->len, sizeof (gpointer), compare, user_data);
 }
 
-