No need for abqdelete: use abqiterate instead.

Copied from Perforce
 Change: 182024
 ServerID: perforce.ravenbrook.com

3 files changed, 27 insertions, 45 deletions

diff --git a/mps/code/abq.c b/mps/code/abq.c
index c327a721a54..7393706d5e5 100644
--- a/mps/code/abq.c
+++ b/mps/code/abq.c
@@ -154,47 +154,6 @@ Res ABQPeek(ABQ abq, Addr elementReturn)
 }
 
 
-typedef struct ABQDeleteClosureStruct *ABQDeleteClosure;
-typedef struct ABQDeleteClosureStruct {
-  Addr element;
-  Size elementSize;
-  Res res;
-} ABQDeleteClosureStruct;
-
-
-static Res ABQDeleteCallback(ABQDisposition *dispositionReturn, Addr element,
-                             void *closureP)
-{
-  ABQDeleteClosure closure = closureP;
-  if (mps_lib_memcmp(element, closure->element, closure->elementSize) == 0) {
-    *dispositionReturn = ABQDispositionDELETE;
-    closure->res = ResOK;
-  } else {
-    *dispositionReturn = ABQDispositionKEEP;
-  }
-  return ResOK;
-}
-
-
-/* ABQDelete -- delete an element from the ABQ */
-Res ABQDelete(ABQ abq, Addr element)
-{
-  ABQDeleteClosureStruct closure;
-
-  AVERT(ABQ, abq);
-
-  METER_ACC(abq->delete, ABQDepth(abq));
-
-  closure.element = element;
-  closure.elementSize = abq->elementSize;
-  closure.res = ResFAIL;
-
-  ABQIterate(abq, ABQDeleteCallback, &closure);
-  
-  return closure.res;
-}
-
-
 /* ABQDescribe -- Describe an ABQ */
 Res ABQDescribe(ABQ abq, ABQDescribeElement describeElement, mps_lib_FILE *stream)
 {
diff --git a/mps/code/abq.h b/mps/code/abq.h
index 085b1ed3d66..1e124f87013 100644
--- a/mps/code/abq.h
+++ b/mps/code/abq.h
@@ -33,7 +33,6 @@ extern void ABQFinish(Arena arena, ABQ abq);
 extern Res ABQPush(ABQ abq, Addr element);
 extern Res ABQPop(ABQ abq, Addr elementReturn);
 extern Res ABQPeek(ABQ abq, Addr elementReturn);
-extern Res ABQDelete(ABQ abq, Addr element);
 extern Res ABQDescribe(ABQ abq, ABQDescribeElement describeElement, mps_lib_FILE *stream);
 extern Bool ABQIsEmpty(ABQ abq);
 extern Bool ABQIsFull(ABQ abq);
diff --git a/mps/code/abqtest.c b/mps/code/abqtest.c
index f1685cde4b7..3da3bc2f36c 100644
--- a/mps/code/abqtest.c
+++ b/mps/code/abqtest.c
@@ -12,6 +12,7 @@
 #include "testlib.h"
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include "mpstd.h"
 #ifdef MPS_OS_IA
 struct itimerspec; /* stop complaints from time.h */
@@ -88,6 +89,27 @@ static void DestroyTestBlock(TestBlock b)
   free(b);
 }
 
+typedef struct TestClosureStruct *TestClosure;
+typedef struct TestClosureStruct {
+  TestBlock b;
+  Res res;
+} TestClosureStruct;
+
+static Res TestDeleteCallback(ABQDisposition *dispositionReturn, Addr element,
+                              void *closureP)
+{
+  TestBlock *a = (TestBlock *)element;
+  TestClosure cl = (TestClosure)closureP;
+  if (*a == cl->b) {
+    *dispositionReturn = ABQDispositionDELETE;
+    cl->res = ResOK;
+    return ResFAIL;
+  } else {
+    *dispositionReturn = ABQDispositionKEEP;
+    return ResOK;
+  }
+}
+
 
 static void step(void)
 {
@@ -121,14 +143,16 @@ static void step(void)
     default:
       if (!deleted & (pushee > popee)) {
         TestBlock b;
-     
+        TestClosureStruct cl;
         deleted = (unsigned)abqRnd (pushee - popee) + popee;
         for (b = testBlocks; b != NULL; b = b->next)
           if (b->id == deleted)
             break;
         cdie(b != NULL, "found to delete");
-        res = ABQDelete(&abq, (Addr)&b);
-        cdie(res == ResOK, "ABQDelete");
+        cl.b = b;
+        cl.res = ResFAIL;
+        ABQIterate(&abq, TestDeleteCallback, &cl);
+        cdie(cl.res == ResOK, "ABQIterate");
       }
   }
 }