COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / client / queue.c

diff --git a/src/client/queue.c b/src/client/queue.c
index 896035b88fc3774ddeca60e4c31839eae772005c..d833ca3c1ff8975824c9b04a121acb0bb519badf 100644 (file)
--- a/src/client/queue.c
+++ b/src/client/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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,6 +31,9 @@
  *     Steve McClure, 1998
  */
 
+#include <config.h>
+
+#include <stdlib.h>
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
@@ -38,43 +41,37 @@
 #include "queue.h"
 
 void
-insque(p, q)
-       struct  qelem *p;
-       struct  qelem *q;
+insque(struct qelem *p, struct qelem *q)
 {
-       p->q_forw = q->q_forw;
-       p->q_back = q;
-       q->q_forw->q_back = p;
-       q->q_forw = p;
+    p->q_forw = q->q_forw;
+    p->q_back = q;
+    q->q_forw->q_back = p;
+    q->q_forw = p;
 }
 
 void
-remque(p)
-       struct  qelem *p;
+remque(struct qelem *p)
 {
-       p->q_back->q_forw = p->q_forw;
-       p->q_forw->q_back = p->q_back;
+    p->q_back->q_forw = p->q_forw;
+    p->q_forw->q_back = p->q_back;
 }
 
 void
-initque(p)
-       struct  qelem *p;
+initque(struct qelem *p)
 {
-       p->q_forw = p;
-       p->q_back = p;
+    p->q_forw = p;
+    p->q_back = p;
 }
 
 struct qelem *
-makeqt(nelem)
-       int     nelem;
+makeqt(int nelem)
 {
-       extern  s_char *malloc();
-       struct  qelem *table;
-       struct  qelem *qp;
-       int     i;
+    struct qelem *table;
+    struct qelem *qp;
+    int i;
 
-       table = (struct qelem *) malloc(sizeof(*table) * nelem);
-       for (i=0,qp=table; i<nelem; i++,qp++)
-               initque(qp);
-       return table;
+    table = malloc(sizeof(*table) * nelem);
+    for (i = 0, qp = table; i < nelem; i++, qp++)
+       initque(qp);
+    return table;
 }