Update copyright notice

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

diff --git a/src/lib/gen/plur.c b/src/lib/gen/plur.c
index 36daddf37e7870c16b1b6cd3e97a7bb492bc6406..aee136a3a6b195ba5ef367e1c3b800fba83c820b 100644 (file)
--- a/src/lib/gen/plur.c
+++ b/src/lib/gen/plur.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-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,33 +19,35 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  plur.c: Pluralize (is that a word?) something
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
+#include <config.h>
+
 #include "prototypes.h"
 
-s_char *
+char *
 splur(int n)
 {
     return n == 1 ? "" : "s";
 }
 
-s_char *
+char *
 esplur(int n)
 {
     return n == 1 ? "" : "es";
 }
 
-s_char *
+char *
 iesplur(int n)
 {
     return n == 1 ? "y" : "ies";
@@ -54,27 +56,27 @@ iesplur(int n)
 /*
  * Change suffix of BUF to English plural if N > 1.
  * Best effort, not 100% accurate English.
- * Array BUF[MAX_LEN] contains a zero-terminated string.
+ * Array BUF[SIZE] contains a zero-terminated string.
  * If there's not enough space for changed suffix, it is truncated.
  */
 char *
-plurize(char *buf, int max_len, int n)
+plurize(char *buf, int size, int n)
 {
     size_t len = strlen(buf);
 
     if (!len || n <= 1)
        return buf;
 
-    switch(buf[len - 1]) {
+    switch (buf[len - 1]) {
     case 'y':
        buf[len - 1] = '\0';
-       strncat(buf, "ies", max_len - len - 1);
+       strncat(buf, "ies", size - len);
        break;
     case 's':
-       strncat(buf, "es", max_len - len - 1);
+       strncat(buf, "es", size - len - 1);
        break;
     default:
-       strncat(buf, "s", max_len - len - 1);
+       strncat(buf, "s", size - len - 1);
     }
     return buf;
 }