Add removing support to arrays

1 files changed, 50 insertions, 9 deletions

diff --git a/libnul.h b/libnul.h
index 413d535..02cfd98 100644
--- a/libnul.h
+++ b/libnul.h
@@ -55,14 +55,18 @@ typedef void * const nul_const_ptr_t;
 /*
  * Generic array implementation
  */
-nul_ptr_t  nul_garray_new        (int element_size) NUL_UR;
-nul_ptr_t  nul_garray_new_prefix (int element_size, int prefix_size) NUL_UR;
-nul_ptr_t  nul_garray_append     (nul_ptr_t array, nul_ptr_t element) NUL_UR;
-gsize      nul_garray_len        (nul_ptr_t array);
-void       nul_garray_free       (nul_ptr_t array);
-
-#define nul_array_new(type)		_nul_array_new_impl(type)
-#define nul_array_append(array,value)	_nul_array_append_impl(array,value)
+nul_ptr_t  nul_garray_new         (int element_size) NUL_UR;
+nul_ptr_t  nul_garray_new_prefix  (int element_size, int prefix_size) NUL_UR;
+nul_ptr_t  nul_garray_append      (nul_ptr_t array, nul_ptr_t element) NUL_UR;
+nul_ptr_t  nul_garray_remove      (nul_ptr_t array, nul_ptr_t element) NUL_UR;
+nul_ptr_t  nul_garray_remove_fast (nul_ptr_t array, nul_ptr_t element) NUL_UR;
+gsize      nul_garray_len         (nul_ptr_t array);
+void       nul_garray_free        (nul_ptr_t array);
+
+#define nul_array_new(type)		   _nul_array_new_impl(type)
+#define nul_array_append(array,value)	   _nul_array_append_impl(array,value)
+#define nul_array_remove(array,value)	   _nul_array_remove_impl(array,value)
+#define nul_array_remove_fast(array,value) _nul_array_remove_fast_impl(array,value)
 #define nul_array_len(array)		nul_garray_len(array)
 #define nul_array_free(array)		nul_garray_free(array)
 
@@ -70,6 +74,10 @@ void       nul_garray_free       (nul_ptr_t array);
     _nul_prefix_array_new_impl(type,member)
 #define nul_prefix_array_append(array,member,value)			\
     _nul_prefix_array_append_impl(array,member,value)
+#define nul_prefix_array_remove(array,member,value)			\
+    _nul_prefix_array_remove_impl(array,member,value)			
+#define nul_prefix_array_remove_fast(array,member,value)		\
+    _nul_prefix_array_remove_impl(array,member,value)
 #define nul_prefix_array_len(array,member)				\
     _nul_prefix_array_len_impl(array,member)
 #define nul_prefix_array_free(array,member)				\
@@ -348,6 +356,24 @@ void nul_dbus_invoke (nul_dbus_service_t *service,
 		 &__nul_temp;						\
 	     })))
 
+#define _nul_array_remove_impl(array,value)				\
+    ((typeof (array))							\
+     nul_garray_remove(array, ({					\
+		 typeof (value) __nul_temp = (value);			\
+		 _NUL_TYPE_CHECK_ARRAY(array,value);			\
+		 &__nul_temp;						\
+	     })))
+
+#define _nul_array_remove_fast_impl(array,value)			\
+    ((typeof (array))							\
+     nul_garray_remove_fast(array, ({					\
+		 typeof (value) __nul_temp = (value);			\
+		 _NUL_TYPE_CHECK_ARRAY(array,value);			\
+		 &__nul_temp;						\
+	     })))
+
+/* Prefix arrays */
+
 #define _nul_prefix_array_new_impl(type,member)				\
     ((type *)nul_garray_new_prefix(					\
 	 sizeof(((type *)NULL)->member[0]),				\
@@ -360,7 +386,22 @@ void nul_dbus_invoke (nul_dbus_service_t *service,
 		 _NUL_TYPE_CHECK_ARRAY(&((array)->member)[0], (value));	\
 		 &__nul_temp;						\
 	     })))
-    
+#define _nul_prefix_array_remove_impl(array,member,value)		\
+    ((typeof (array))							\
+     nul_garray_remove(array, ({					\
+		 typeof (value) __nul_temp = (value);			\
+		 _NUL_TYPE_CHECK_ARRAY(&((array)->member)[0], (value))	\
+		     &__nul_temp;					\
+	     })))
+
+#define _nul_prefix_array_remove_fast_impl(array,member,value)		\
+    ((typeof (array))							\
+     nul_garray_remove_fast(array, ({					\
+		 typeof (value) __nul_temp = (value);			\
+		 _NUL_TYPE_CHECK_ARRAY(&((array)->member)[0], (value))	\
+		     &__nul_temp;					\
+	     })))
+
 #define _nul_prefix_array_len_impl(array,member)			\
     ({	(void)((array)->member);					\
 	nul_garray_len(array);						\