Update copyright notice.

[empserver] / src / client / ioqueue.c

diff --git a/src/client/ioqueue.c b/src/client/ioqueue.c
index 5d735b61982de18ee90e35bbc422ab244417bf0c..cfff85d328f61a1a3c22fd12f08696a1ddd36f58 100644 (file)
--- a/src/client/ioqueue.c
+++ b/src/client/ioqueue.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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -35,56 +35,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef _WIN32
-#include <sys/uio.h>
-#include <unistd.h>
-#endif
 #include "misc.h"
 #include "queue.h"
 #include "ioqueue.h"
 
-#ifdef _WIN32
-typedef struct iovec {
-    char *iov_base;
-    int iov_len;
-} iovec_t;
-#endif
-
-
 static int ioqtobuf(register struct ioqueue *ioq, s_char *buf, int cc);
-static int ioqtoiov(register struct ioqueue *ioq, register struct iovec *iov, register int max);
 static void enqueuecc(struct ioqueue *ioq, s_char *buf, int cc);
 static int dequeuecc(register struct ioqueue *ioq, register int cc);
 
-void insque(struct qelem *, struct qelem *);
-void remque(struct qelem *);
-void initque(struct qelem *p);
-struct qelem *makeqt(int nelem);
 
 void
 ioq_init(struct ioqueue *ioq, int bsize)
 {
-    extern s_char num_teles[];
-
     initque(&ioq->queue);
     ioq->cc = 0;
     ioq->bsize = bsize;
     *num_teles = '\0';
 }
 
-/*
- * copy batch of pointers into the passed
- * iovec, but don't actually dequeue the data.
- * return # of iovec initialized.
- */
-int
-ioq_peekiov(struct ioqueue *ioq, struct iovec *iov, int max)
-{
-    if (ioq->cc <= 0)
-       return 0;
-    return ioqtoiov(ioq, iov, max);
-}
-
 /*
  * Copy the specified number of characters into the buffer
  * provided, without actually dequeueing the data.  Return
@@ -202,38 +170,6 @@ ioqtobuf(register struct ioqueue *ioq, s_char *buf, int cc)
     return offset - buf;
 }
 
-/*
- * translate "around" max bytes to an iovec
- * array.  The limit max is only advisory,
- * and more may get buffered.  It is an attempt to limit
- * really silly sends -- like sending 40k on a socket
- * with one writev for example.  This makes the processing
- * of a full ioqueue still be quick.
- */
-static int
-ioqtoiov(register struct ioqueue *ioq, register struct iovec *iov, register int max)
-{
-    register struct io *io;
-    register int cc;
-    register int niov;
-    struct qelem *qp;
-
-    cc = 0;
-    niov = 0;
-    qp = ioq->queue.q_forw;
-    for (qp = ioq->queue.q_forw; qp != &ioq->queue; qp = qp->q_forw) {
-       io = (struct io *)qp;
-       if (niov >= MAXIOV || cc >= max)
-           break;
-       iov->iov_base = io->data + io->offset;
-       iov->iov_len = io->nbytes - io->offset;
-       cc += io->nbytes - io->offset;
-       niov++;
-       iov++;
-    }
-    return niov;
-}
-
 /*
  * append a buffer to the end of the ioq.
  */