Update copyright notice

[empserver] / src / lib / gen / queue.c

diff --git a/src/lib/gen/queue.c b/src/lib/gen/queue.c
index c454ebd0b490bcdd804b6a4e5bdd7c79418334f2..62f512afda74058e9e28a81861ff018e89781d92 100644 (file)
--- a/src/lib/gen/queue.c
+++ b/src/lib/gen/queue.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,47 +19,62 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  queue.c: Various queue routines (for lists)
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
+#include <config.h>
+
+#include <stddef.h>
 #include "queue.h"
 
 void
 emp_insque(struct emp_qelem *elem, struct emp_qelem *queue)
 {
-       struct  emp_qelem *next;
+    struct emp_qelem *next;
 
-       next = queue->q_forw;
-       queue->q_forw = elem;
-       elem->q_forw = next;
-       elem->q_back = queue;
-       next->q_back = elem;
+    next = queue->q_forw;
+    queue->q_forw = elem;
+    elem->q_forw = next;
+    elem->q_back = queue;
+    next->q_back = elem;
 }
 
 void
 emp_remque(struct emp_qelem *elem)
 {
-       if (elem == (struct emp_qelem *)0)
-               return;
-       if (elem->q_forw != (struct emp_qelem *)0)
-               elem->q_forw->q_back = elem->q_back;
-       if (elem->q_back != (struct emp_qelem *)0)
-               elem->q_back->q_forw = elem->q_forw;
+    if (!elem)
+       return;
+    if (elem->q_forw)
+       elem->q_forw->q_back = elem->q_back;
+    if (elem->q_back)
+       elem->q_back->q_forw = elem->q_forw;
+}
+
+struct emp_qelem *
+emp_searchque(struct emp_qelem *queue, void *key,
+             int (*test)(struct emp_qelem *, void *))
+{
+    struct emp_qelem *qp;
+
+    for (qp = queue->q_forw; qp != queue; qp = qp->q_forw) {
+       if (test(qp, key))
+           return qp;
+    }
+    return NULL;
 }
 
 void
 emp_initque(struct emp_qelem *elem)
 {
-       elem->q_forw = elem;
-       elem->q_back = elem;
+    elem->q_forw = elem;
+    elem->q_back = elem;
 }
-