Update copyright notice

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

diff --git a/src/lib/gen/queue.c b/src/lib/gen/queue.c
index 5a48de7f0b309284d563756dc0dc4ce511f8ea6a..0212a44327a3092eceb3e60001002a127ba63041 100644 (file)
--- a/src/lib/gen/queue.c
+++ b/src/lib/gen/queue.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,25 +14,25 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  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:
- *     
+ *     Markus Armbruster, 2014
  */
 
 #include <config.h>
 
+#include <stddef.h>
 #include "queue.h"
 
 void
@@ -50,14 +50,38 @@ emp_insque(struct emp_qelem *elem, struct emp_qelem *queue)
 void
 emp_remque(struct emp_qelem *elem)
 {
-    if (elem == (struct emp_qelem *)0)
+    if (!elem)
        return;
-    if (elem->q_forw != (struct emp_qelem *)0)
+    if (elem->q_forw)
        elem->q_forw->q_back = elem->q_back;
-    if (elem->q_back != (struct emp_qelem *)0)
+    if (elem->q_back)
        elem->q_back->q_forw = elem->q_forw;
 }
 
+int
+emp_quelen(struct emp_qelem *queue)
+{
+    struct emp_qelem *qp;
+    int len;
+
+    for (qp = queue->q_forw, len = 0; qp != queue; qp = qp->q_forw, len++)
+       ;
+    return len;
+}
+
+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)
 {