From df9798c8191deb054787fb4fb78929ce6ac59c49 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Mon, 4 Nov 2019 22:05:21 +1100
Subject: [PATCH] [common] added objectlist_pop and objectlist_remove methods

---
 VERSION                            |  2 +-
 common/include/common/objectlist.h | 12 ++++++-----
 common/src/objectlist.c            | 32 ++++++++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index de8cec27..269c01c4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-B1-26-g01f5238a9d+1
\ No newline at end of file
+B1-27-g1dfa0ed218+1
\ No newline at end of file
diff --git a/common/include/common/objectlist.h b/common/include/common/objectlist.h
index e547801b..841971d3 100644
--- a/common/include/common/objectlist.h
+++ b/common/include/common/objectlist.h
@@ -23,11 +23,13 @@ typedef struct ObjectList * ObjectList;
 
 typedef void (*ObjectFreeFn)(void * object);
 
-ObjectList   objectlist_new  (ObjectFreeFn free_fn);
-void         objectlist_free (ObjectList * sl);
-int          objectlist_push (ObjectList sl, void * object);
-unsigned int objectlist_count(ObjectList sl);
-char *       objectlist_at   (ObjectList sl, unsigned int index);
+ObjectList   objectlist_new   (ObjectFreeFn free_fn);
+void         objectlist_free  (ObjectList * ol);
+int          objectlist_push  (ObjectList ol, void * object);
+void *       objectlist_pop   (ObjectList ol);
+bool         objectlist_remove(ObjectList ol, unsigned int index);
+unsigned int objectlist_count (ObjectList ol);
+void *       objectlist_at    (ObjectList ol, unsigned int index);
 
 // generic free method
 void objectlist_free_item(void *object);
\ No newline at end of file
diff --git a/common/src/objectlist.c b/common/src/objectlist.c
index be28fbfa..6052b4f7 100644
--- a/common/src/objectlist.c
+++ b/common/src/objectlist.c
@@ -20,6 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include "common/objectlist.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 struct ObjectList
 {
@@ -57,7 +58,7 @@ int objectlist_push(ObjectList ol, void * object)
   if (ol->count == ol->size)
   {
     ol->size += 32;
-    ol->list  = realloc(ol->list, sizeof(char *) * ol->size);
+    ol->list  = realloc(ol->list, sizeof(void *) * ol->size);
   }
 
   unsigned int index = ol->count;
@@ -65,12 +66,39 @@ int objectlist_push(ObjectList ol, void * object)
   return index;
 }
 
+void * objectlist_pop(ObjectList ol)
+{
+  if (ol->count == 0)
+    return NULL;
+
+  return ol->list[--ol->count];
+}
+
+bool objectlist_remove(ObjectList ol, unsigned int index)
+{
+  if (index >= ol->count)
+    return false;
+
+  if (ol->free_fn)
+    ol->free_fn(ol->list[index]);
+
+  void ** newlist = malloc(sizeof(void *) * ol->size);
+
+  --ol->count;
+  memcpy(&newlist[0], &ol->list[0], index * sizeof(void *));
+  memcpy(&newlist[index], &ol->list[index + 1], (ol->count - index) * sizeof(void *));
+
+  free(ol->list);
+  ol->list = newlist;
+  return true;
+}
+
 unsigned int objectlist_count(ObjectList ol)
 {
   return ol->count;
 }
 
-char * objectlist_at(ObjectList ol, unsigned int index)
+void * objectlist_at(ObjectList ol, unsigned int index)
 {
   if (index >= ol->count)
     return NULL;