Update copyright notice.

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

diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index 16ab4fd3e3d96ffd12ce203880a42c827ef5ec48..fba71df9abf7c28bdca8d482108bb082b2a4b059 100644 (file)
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, 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.
  *
  *  ---
  *
@@ -37,29 +37,26 @@
  * that is left for a higher level.
  */
 
+#include <config.h>
+
 #include <stdio.h>
-#include <stdlib.h>            /* malloc free */
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
 #if !defined(_WIN32)
+#include <sys/types.h>
 #include <sys/uio.h>
 #endif
+#include "ioqueue.h"
 #include "misc.h"
 #include "queue.h"
-#include "ioqueue.h"
 
-static int ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc,
-                    register int stopc);
+static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, int stopc);
 #if !defined(_WIN32)
-static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov,
-                   register int max);
-#endif
-static int ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc);
-static int appendcc(struct ioqueue *ioq, s_char *buf, int cc);
-static int removecc(struct ioqueue *ioq, register int cc);
-
-#if defined(_WIN32)
-static void loc_StripDels(char *pBuf);
+static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov, int max);
 #endif
+static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);
+static int appendcc(struct ioqueue *ioq, char *buf, int cc);
+static int removecc(struct ioqueue *ioq, int cc);
 
 struct ioqueue *
 ioq_create(int size)
@@ -80,10 +77,7 @@ ioq_create(int size)
 void
 ioq_destroy(struct ioqueue *ioq)
 {
-#if !defined(aix) && !defined(NeXT)
-/* ioq_drain doesn't work under aix or NeXT... dunno why --ts */
     ioq_drain(ioq);
-#endif /* aix */
     free(ioq);
 }
 
@@ -124,7 +118,7 @@ ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc)
  * number of bytes actually found.
  */
 int
-ioq_peek(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_peek(struct ioqueue *ioq, char *buf, int cc)
 {
     return ioqtobuf(ioq, buf, cc);
 }
@@ -136,7 +130,7 @@ ioq_dequeue(struct ioqueue *ioq, int cc)
 }
 
 void
-ioq_append(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_append(struct ioqueue *ioq, char *buf, int cc)
 {
     appendcc(ioq, buf, cc);
 }
@@ -153,7 +147,7 @@ ioq_qsize(struct ioqueue *ioq)
  * no input is available
  */
 int
-ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
+ioq_gets(struct ioqueue *ioq, char *buf, int cc)
 {
     int nbytes;
     int actual;
@@ -174,30 +168,24 @@ ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
 }
 
 int
-ioq_puts(struct ioqueue *ioq, s_char *buf)
+ioq_puts(struct ioqueue *ioq, char *buf)
 {
     return appendcc(ioq, buf, strlen(buf));
 }
 
-/*
- * all the rest are local to this module
- */
-
-
 /*
  * copy cc bytes from ioq to buf.
  * this routine doesn't free memory; this is
  * left for a higher level.
  */
 static int
-ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
+ioqtobuf(struct ioqueue *ioq, char *buf, int cc)
 {
     struct io *io;
     struct emp_qelem *qp;
     struct emp_qelem *head;
-    register int nbytes;
-    register int nleft;
-    register s_char *offset;
+    int nbytes, nleft;
+    char *offset;
 
     nleft = cc;
     offset = buf;
@@ -224,11 +212,11 @@ ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
  * terminating on the stop character.
  */
 static int
-ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc, register int stopc)
+ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, int stopc)
 {
-    register int nbytes;
-    register s_char *p;
-    register int n;
+    int nbytes;
+    char *p;
+    int n;
     struct io *io;
     struct emp_qelem *qp;
     struct emp_qelem *head;
@@ -262,12 +250,10 @@ ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc, register int stopc)
  */
 #if !defined(_WIN32)
 static int
-ioqtoiov(struct ioqueue *ioq, struct iovec *iov, register int max)
+ioqtoiov(struct ioqueue *ioq, struct iovec *iov, int max)
 {
     struct io *io;
-    register int cc;
-    register int niov;
-    register int len;
+    int cc, niov, len;
     struct emp_qelem *qp;
 
     cc = max;
@@ -295,11 +281,11 @@ ioqtoiov(struct ioqueue *ioq, struct iovec *iov, register int max)
  * append a buffer to the end of the ioq.
  */
 static int
-appendcc(struct ioqueue *ioq, s_char *buf, int cc)
+appendcc(struct ioqueue *ioq, char *buf, int cc)
 {
     struct io *io;
     int len;
-    s_char *ptr;
+    char *ptr;
     int avail;
 
     /* determine if any space is left */
@@ -335,13 +321,11 @@ appendcc(struct ioqueue *ioq, s_char *buf, int cc)
  * which are no longer used.
  */
 static int
-removecc(struct ioqueue *ioq, register int cc)
+removecc(struct ioqueue *ioq, int cc)
 {
     struct io *io;
     struct emp_qelem *qp;
-    register int nbytes;
-    register int there;
-    register int remain;
+    int nbytes, there, remain;
 
     nbytes = 0;
     remain = cc;
@@ -390,7 +374,7 @@ ioq_makebuf(struct ioqueue *ioq, char *pBuf, int nBufLen)
     int nbytes;
     int nleft;
     int ncopied;
-    s_char *offset;
+    char *offset;
 
     ncopied = 0;
     nleft = nBufLen;