From 40e67dfce009bd854f5c4601267478c323e89ae7 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Thu, 21 Sep 2000 01:25:47 +0000
Subject: [PATCH] Removed some redundant code.

---
 WINGs/array.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/WINGs/array.c b/WINGs/array.c
index 55080e6b..8239fbe4 100644
--- a/WINGs/array.c
+++ b/WINGs/array.c
@@ -159,20 +159,6 @@ WMReplaceInArray(WMArray *array, unsigned index, void *item)
 }
 
 
-static void
-deleteFromArray(WMArray *array, unsigned index)
-{
-    /*wassertr(index < array->itemCount);*/
-
-    if (index < array->itemCount-1) {
-        memmove(array->items+index, array->items+index+1,
-                sizeof(void*)*(array->itemCount-index-1));
-    }
-
-    array->itemCount--;
-}
-
-
 int
 WMDeleteFromArray(WMArray *array, unsigned index)
 {
@@ -183,7 +169,12 @@ WMDeleteFromArray(WMArray *array, unsigned index)
         array->destructor(array->items[index]);
     }
 
-    deleteFromArray(array, index);
+    if (index < array->itemCount-1) {
+        memmove(array->items+index, array->items+index+1,
+                sizeof(void*)*(array->itemCount-index-1));
+    }
+
+    array->itemCount--;
 
     return 1;
 }
@@ -217,11 +208,9 @@ WMGetFromArray(WMArray *array, unsigned index)
 void*
 WMPopFromArray(WMArray *array)
 {
-    void *last = array->items[array->itemCount-1];
-
-    deleteFromArray(array, array->itemCount-1);
+    array->itemCount--;
 
-    return last;
+    return array->items[array->itemCount];
 }
 
 
-- 
2.11.4.GIT