gvpr pop: remove 'delete' parameter that is always 1 and unused 'head'

diff --git a/lib/gvpr/queue.c b/lib/gvpr/queue.c
index 457043bd244af4a8b8ade60f52f10393beeb3d12..7905915654236918cb8f90ad6b17a25bfc70fa56 100644 (file)
--- a/lib/gvpr/queue.c
+++ b/lib/gvpr/queue.c
@@ -69,16 +69,14 @@ void push(queue * nq, void *n)
     dtinsert(nq, &obj);
 }
 
-void *pop(queue * nq, int delete)
-{
+void *pop(queue *nq) {
     nsitem *obj;
     void *n;
 
     obj = dtfirst(nq);
     if (obj) {
        n = obj->np;
-       if (delete)
-           dtdelete(nq, 0);
+       dtdelete(nq, 0);
        return n;
     } else
        return 0;

diff --git a/lib/gvpr/queue.h b/lib/gvpr/queue.h
index bed779912829cc7573fb23d84ef5df49292b91dc..4080b444628aa60b40cfafd29a5aa2b4049d5d2a 100644 (file)
--- a/lib/gvpr/queue.h
+++ b/lib/gvpr/queue.h
@@ -20,7 +20,7 @@ extern "C" {
 
     extern queue *mkQ(Dtmethod_t *);
     extern void push(queue *, void *);
-    extern void *pop(queue *, int remove);
+    extern void *pop(queue *);
     extern void freeQ(queue *);
 
 /* pseudo-functions:
@@ -30,8 +30,7 @@ extern void* head(queue*);
  */
 
 #define mkQueue()  mkQ(Dtqueue)
-#define pull(q)  (pop(q,1))
-#define head(q)  (pop(q,0))
+#define pull(q)  (pop(q))
 
 #ifdef __cplusplus
 }