Update copyright notice

[empserver] / src / client / ringbuf.c

diff --git a/src/client/ringbuf.c b/src/client/ringbuf.c
index b893bc1035a30ab0a0e9d556f46fb8a91e580f1b..72cff67e12f78de347d67bfdd03556eb2efc756e 100644 (file)
--- a/src/client/ringbuf.c
+++ b/src/client/ringbuf.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,9 @@
  *  ---
  *
  *  ringbuf.c: Simple ring buffer
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2009
  */
 
 #include <config.h>
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/uio.h>
-#include <unistd.h>
 #include "ringbuf.h"
 
 /*
@@ -118,7 +117,7 @@ ring_putc(struct ring *r, unsigned char c)
 /*
  * Attempt to put SZ bytes from BUF into the ring buffer.
  * Return space left in ring buffer when it fits, else don't change
- * the ring buffer and return how much space is missing.
+ * the ring buffer and return how much space is missing times -1.
  */
 int
 ring_putm(struct ring *r, void *buf, size_t sz)
@@ -145,7 +144,7 @@ ring_putm(struct ring *r, void *buf, size_t sz)
 void
 ring_discard(struct ring *r, int n)
 {
-    assert(n <= ring_len(r));
+    assert(0 <= n && n <= ring_len(r));
     r->cons += n;
 }