Update copyright notice

[empserver] / include / ioqueue.h

diff --git a/include/ioqueue.h b/include/ioqueue.h
index 58e9a9998aed28d2d3febb7ab7c27aed6194a7f0..bb0e90db3ca45ffb60a6ee35f98b83017e185ff1 100644 (file)
--- a/include/ioqueue.h
+++ b/include/ioqueue.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,53 +14,38 @@
  *  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.
  *
  *  ---
  *
  *  ioqueue.h: Stores and frees data associated with a file descriptor.
  *             uses writev to write, and read to read
  *  Known contributors to this file:
- * 
+ *
  */
 
 #ifndef IOQUEUE_H
 #define IOQUEUE_H
 
-struct io {
-    struct emp_qelem queue;
-    int size;
-    int nbytes;
-    int offset;
-    s_char *data;
-};
+#include <sys/uio.h>
 
-struct ioqueue {
-    struct io list;
-    int bufsize;
-    int cc;
-};
+struct ioqueue;
 
 extern struct ioqueue *ioq_create(int size);
 extern void ioq_destroy(struct ioqueue *ioq);
 extern void ioq_drain(struct ioqueue *ioq);
-#if defined (_WIN32)
-extern int ioq_makebuf(struct ioqueue *ioq, char *pBuf, int nBufLen);
-#else
 extern int ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc);
-#endif
-extern int ioq_peek(struct ioqueue *ioq, s_char *buf, int cc);
-extern int ioq_dequeue(struct ioqueue *ioq, int cc);
-extern void ioq_append(struct ioqueue *ioq, s_char *buf, int cc);
+extern int ioq_peek(struct ioqueue *ioq, char *buf, int cc);
+extern void ioq_dequeue(struct ioqueue *ioq, int cc);
+extern void ioq_append(struct ioqueue *ioq, char *buf, int cc);
 extern int ioq_qsize(struct ioqueue *ioq);
-extern int ioq_gets(struct ioqueue *ioq, s_char *buf, int cc);
-extern int ioq_puts(struct ioqueue *ioq, s_char *buf);
+extern int ioq_gets(struct ioqueue *ioq, char *buf, int cc);
+extern int ioq_puts(struct ioqueue *ioq, char *buf);
 
 #endif