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

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

diff --git a/eglib/src/garray.c b/eglib/src/garray.c
index bdaaaf8920bcb2d3bb36917924bab7721e8cae1e..b9844f88a9125869e98c8bb0549f3c55013df647 100644 (file)
--- a/eglib/src/garray.c
+++ b/eglib/src/garray.c
@@ -25,8 +25,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
- 
-#define _GNU_SOURCE
+
 #include <stdlib.h>
 #include <glib.h>
 
@@ -36,34 +35,32 @@
 #define element_length(p,i) ((i) * (p)->element_size)
 
 typedef struct {
-  GArray array;
-  gboolean clear_;
-  gboolean element_size;
-  gboolean zero_terminated;
-  gint capacity;
+       GArray array;
+       gboolean clear_;
+       guint element_size;
+       gboolean zero_terminated;
+       guint capacity;
 } GArrayPriv;
 
 static void
-ensure_capacity (GArrayPriv *priv,
-                int capacity)
+ensure_capacity (GArrayPriv *priv, guint capacity)
 {
-       int new_capacity = MAX (priv->capacity, INITIAL_CAPACITY);
-
-       if (capacity < priv->capacity)
+       guint new_capacity;
+       
+       if (capacity <= priv->capacity)
                return;
-
-       while (new_capacity < capacity) {
-               new_capacity <<= 1;
-       }
-       capacity = new_capacity;
-       priv->array.data = (gchar*)g_realloc (priv->array.data, element_length (priv, capacity));
-
+       
+       new_capacity = (capacity + 63) & ~63;
+       
+       priv->array.data = g_realloc (priv->array.data, element_length (priv, new_capacity));
+       
        if (priv->clear_) {
                memset (element_offset (priv, priv->capacity),
                        0,
-                       element_length (priv, capacity - priv->capacity));
+                       element_length (priv, new_capacity - priv->capacity));
        }
-       priv->capacity = capacity;
+       
+       priv->capacity = new_capacity;
 }
 
 GArray *
@@ -81,11 +78,30 @@ g_array_new (gboolean zero_terminated,
        return (GArray*)rv;
 }
 
+GArray *
+g_array_sized_new (gboolean zero_terminated,
+            gboolean clear_,
+            guint element_size,
+                guint reserved_size)
+{
+       GArrayPriv *rv = g_new0 (GArrayPriv, 1);
+       rv->zero_terminated = zero_terminated;
+       rv->clear_ = clear_;
+       rv->element_size = element_size;
+
+       ensure_capacity (rv, reserved_size);
+
+       return (GArray*)rv;
+}
+
 gchar*
 g_array_free (GArray *array,
              gboolean free_segment)
 {
        gchar* rv = NULL;
+
+       g_return_val_if_fail (array != NULL, NULL);
+
        if (free_segment)
                g_free (array->data);
        else
@@ -103,6 +119,8 @@ g_array_append_vals (GArray *array,
 {
        GArrayPriv *priv = (GArrayPriv*)array;
 
+       g_return_val_if_fail (array != NULL, NULL);
+
        ensure_capacity (priv, priv->array.len + len + (priv->zero_terminated ? 1 : 0));
   
        memmove (element_offset (priv, priv->array.len),
@@ -127,18 +145,21 @@ g_array_insert_vals (GArray *array,
                     guint len)
 {
        GArrayPriv *priv = (GArrayPriv*)array;
+       guint extra = (priv->zero_terminated ? 1 : 0);
+
+       g_return_val_if_fail (array != NULL, NULL);
 
-       ensure_capacity (priv, array->len + len + (priv->zero_terminated ? 1 : 0));
+       ensure_capacity (priv, array->len + len + extra);
   
        /* first move the existing elements out of the way */
        memmove (element_offset (priv, index_ + len),
                 element_offset (priv, index_),
-                element_length (priv, len - index_));
+                element_length (priv, array->len - index_));
 
        /* then copy the new elements into the array */
-       memmove (element_offset (priv, array->len),
+       memmove (element_offset (priv, index_),
                 data,
-                element_length (priv, index_));
+                element_length (priv, len));
 
        array->len += len;
 
@@ -157,6 +178,8 @@ g_array_remove_index (GArray *array,
 {
        GArrayPriv *priv = (GArrayPriv*)array;
 
+       g_return_val_if_fail (array != NULL, NULL);
+
        memmove (element_offset (priv, index_),
                 element_offset (priv, index_ + 1),
                 element_length (priv, array->len - index_));
@@ -171,3 +194,45 @@ g_array_remove_index (GArray *array,
 
        return array;
 }
+
+GArray*
+g_array_remove_index_fast (GArray *array,
+                     guint index_)
+{
+       GArrayPriv *priv = (GArrayPriv*)array;
+
+       g_return_val_if_fail (array != NULL, NULL);
+
+       memmove (element_offset (priv, index_),
+                element_offset (priv, array->len - 1),
+                element_length (priv, 1));
+
+       array->len --;
+
+       if (priv->zero_terminated) {
+               memset (element_offset (priv, priv->array.len),
+                       0,
+                       priv->element_size);
+       }
+
+       return array;
+}
+
+void
+g_array_set_size (GArray *array, gint length)
+{
+       GArrayPriv *priv = (GArrayPriv*)array;
+
+       g_return_if_fail (array != NULL);
+       g_return_if_fail (length >= 0);
+
+       if (length == priv->capacity)
+               return; // nothing to be done
+
+       if (length > priv->capacity) {
+               // grow the array
+               ensure_capacity (priv, length);
+       }
+
+       array->len = length;
+}