fixed queues for real this time

Author: Shane J Gianelli

queue.c

@@ -20,17 +20,15 @@ QueueModuleInit ()
   for (i = 0; i < QUEUE_MAX_LINKS; i++) {
     dbprintf ('i', "Initializing queue link %d.\n", i);
     linkpool[i].next = NULL;
-    linkpool[i].prev = NULL;
-    linkpool[i].object = NULL;
     QueueFreeLink (&(linkpool[i]));
   }
 }
 
 void
 QueueInit (Queue *q)
 {
-    q->first = NULL;
-    q->last = NULL;
+    q->first = (Link *)q;
+    q->last = (Link *)q;
     q->nitems = 0;
 }
 

queue.h

@@ -20,173 +20,105 @@
 #define	QUEUE_MAX_LINKS		400
 
 typedef struct Link {
-  struct Link	*next;
-  struct Link *prev;
-  struct Queue *queue;
-  void	*object;
+    struct Link	*next;
+    struct Link *prev;
+    struct Queue *queue;
+    void	*object;
 } Link;
 
 typedef struct Queue {
-  struct Link *first;
-  struct Link *last;
-  int		nitems;
+    struct Link *first;
+    struct Link *last;
+    int		nitems;
 } Queue;
 
 inline
-  void
+void
 QueueLinkInit (Link *l, void *obj)
 {
-  l->next = NULL;
-  l->object = obj;
+    l->next = NULL;
+    l->object = obj;
 }
 
 inline
-  Link *
+Link *
 QueueNext (Link *l)
 {
-  return (l->next);
+    return (l->next);
 }
 
 inline
-  Link *
+Link *
 QueuePrev (Link *l)
 {
-  return (l->prev);
+    return (l->prev);
 }
 
 inline
-  Link *
+Link *
 QueueFirst (Queue *q)
 {
-  return (q->first);
+    return (q->first);
 }
 
 inline
-  Link *
+Link *
 QueueLast (Queue *q)
 {
-  return (q->last);
+    return (q->last);
 }
 
-inline
-  void
-QueuePrint(Queue *q) {
-  Link *l = q->first;
-  int i = 0;
-
-  dbprintf('q', "\tFirst: %p Last: %p\n",q->first,q->last);
-  while (l != NULL) {
-    dbprintf('q', "\tLink: %p o(%p)\n",l,l->object);
-    l = l->next; 
-    if (i++ == 10)
-        break;
-  }
-
-  dbprintf('q', "Done printing links of (%p)\n",q);
-}
 
 inline
-  void
+void
 QueueInsertAfter (Queue *q, Link *after, Link *l)
 {
-  dbprintf('q', "Inserting link (%p) after (%p)\n",l->object,after);
-  l->queue = q;
-
-  if (after) {
+    l->queue = q;
     l->prev = after;
-    dbprintf('q', "After->%p\n",after->next);
     l->next = after->next;
     after->next = l;
     l->next->prev = l;
-
-    if (q->last == after) {
-      q->last = after->next;
-    }
-  } else if (q->nitems > 0) {
-    q->first->prev = l;
-    l->next = q->first;
-    q->first = l;
-    q->first->prev = NULL;
-  } else {
-    q->first = l;
-
-    if (!q->last)
-        q->last = q->first;
-  }
-
-  q->nitems += 1;
-
-  if (l->object)
-    QueuePrint(q);
+    q->nitems += 1;
 }
 
 inline
-  void
+void
 QueueInsertFirst (Queue *q, Link *l)
 {
-  QueueInsertAfter (q, NULL, l);
+    QueueInsertAfter (q, (Link *)q, l);
 }
 
 inline
-  void
+void
 QueueInsertLast (Queue *q, Link *l)
 {
-  QueueInsertAfter (q, QueueLast(q), l);
+    QueueInsertAfter (q, QueueLast(q), l);
 }
 
 inline
-  void
+void
 QueueRemove (Link *l)
 {
-  Queue *q = l->queue;
-  dbprintf('q', "Removing entry (%p->%p)\n",l,l->object);
-  QueuePrint(q);
-
-  if (q->nitems > 1) {
-    if (q->first == l)
-      q->first = q->first->next;
-    else if (q->last == l) {
-      q->last = q->last->prev;
-      q->last->next = NULL;
-    } else {
-      l->prev->next = l->next;
-      l->next->prev = l->prev;
+    if (l->queue->nitems > 0) {
+	l->prev->next = l->next;
+	l->next->prev = l->prev;
+	l->queue->nitems -= 1;
     }
-  } else {
-    q->first = NULL;
-    q->last = NULL;
-  }
-
-  q->nitems -= 1;
-
-  l->prev = NULL;
-  l->next = NULL;
-
-  dbprintf('q', "Removing entry (%p->%p)\n",l,l->object);
-  QueuePrint(q);
+    l->next = NULL;
 }
 
 inline
-  int
+int
 QueueLength (Queue *q)
 {
-  return (q->nitems);
+    return (q->nitems);
 }
 
 inline
-  int
+int
 QueueEmpty (Queue *q)
 {
-  return (QueueLength (q) == 0);
-}
-
-inline
-void
-LinkMoveToLast(Link *l) {
-  Queue *q = l->queue;
-  QueueRemove(l);
-
-  QueueInsertLast(q, l);
+    return (QueueLength (q) == 0);
 }
 
 extern void	QueueModuleInit ();