Merge pull request #2134 from masatake/make-ptrArrayRemoveLast-return…

…-the-removing-item main: make ptrArrayRemoveLast return the removing item
universal-ctags · Jul 8, 2019 · 1258adf · 1258adf
2 parents 5b25693 + 83463ee
commit 1258adf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/main/ptrarray.c b/main/ptrarray.c
@@ -55,11 +55,13 @@ extern void ptrArrayAdd (ptrArray *const current, void *ptr)
 	current->array [current->count++] = ptr;
 }
 
-extern void ptrArrayRemoveLast (ptrArray *const current)
+extern void *ptrArrayRemoveLast (ptrArray *const current)
 {
 	Assert (current != NULL);
 	Assert (current->count > 0);
+	void *r = ptrArrayLast (current);
 	--current->count;
+	return r;
 }
 
 /* Combine array `from' into `current', deleting `from' */

diff --git a/main/ptrarray.h b/main/ptrarray.h
@@ -30,7 +30,7 @@ typedef void (*ptrArrayDeleteFunc) (void *data);
 
 extern ptrArray *ptrArrayNew (ptrArrayDeleteFunc deleteFunc);
 extern void ptrArrayAdd (ptrArray *const current, void *ptr);
-extern void ptrArrayRemoveLast (ptrArray *const current);
+extern void *ptrArrayRemoveLast (ptrArray *const current);
 extern void ptrArrayCombine (ptrArray *const current, ptrArray *const from);
 extern void ptrArrayClear (ptrArray *const current);
 extern unsigned int ptrArrayCount (const ptrArray *const current);