GPtrArray: Added g_ptr_array_insert()

Speaks for itself, I've found myself on numerous occasions
writing my own version of this, or using a GArray of pointers.

https://bugzilla.gnome.org/show_bug.cgi?id=719395

diff --git a/glib/garray.c b/glib/garray.c
index 062d568f42af4c5b7a62e3a2c942656de7748cb5..a9c99b2aa0b22b368d5d10754559b86c1aa928b6 100644 (file)
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -1382,6 +1382,42 @@ g_ptr_array_add (GPtrArray *farray,
   array->pdata[array->len++] = data;
 }
 
+/**
+ * g_ptr_array_insert:
+ * @array: a #GPtrArray.
+ * @index_: the index to place the new element at, or -1 to append.
+ * @data: the pointer to add.
+ *
+ * Inserts an element into the pointer array at the given index. The 
+ * array will grow in size automatically if necessary.
+ *
+ * Since: 2.40
+ **/
+void
+g_ptr_array_insert (GPtrArray *farray,
+                    gint       index_,
+                    gpointer   data)
+{
+  GRealPtrArray* array = (GRealPtrArray*) farray;
+
+  g_return_if_fail (array);
+  g_return_if_fail (index_ >= -1);
+  g_return_if_fail (index_ <= (gint)array->len);
+
+  g_ptr_array_maybe_expand (array, 1);
+
+  if (index_ < 0)
+    index_ = array->len;
+
+  if (index_ < array->len)
+    memmove (&(array->pdata[index_ + 1]),
+             &(array->pdata[index_]),
+             (array->len - index_) * sizeof (gpointer));
+
+  array->len++;
+  array->pdata[index_] = data;
+}
+
 /**
  * g_ptr_array_sort:
  * @array: a #GPtrArray.

diff --git a/glib/garray.h b/glib/garray.h
index 018436f8c15c37acefc7725fe6f740ccb8aadeae..7fe8c2f2b630d7e08e162d6114e6b4580466cc5e 100644 (file)
--- a/glib/garray.h
+++ b/glib/garray.h
@@ -169,6 +169,10 @@ GPtrArray *g_ptr_array_remove_range       (GPtrArray        *array,
 GLIB_AVAILABLE_IN_ALL
 void       g_ptr_array_add                (GPtrArray        *array,
                                           gpointer          data);
+GLIB_AVAILABLE_IN_2_40
+void       g_ptr_array_insert             (GPtrArray        *farray,
+                                           gint              index_,
+                                           gpointer          data);
 GLIB_AVAILABLE_IN_ALL
 void       g_ptr_array_sort               (GPtrArray        *array,
                                           GCompareFunc      compare_func);