Update copyright notice

[empserver] / src / lib / as / as_cache.c

diff --git a/src/lib/as/as_cache.c b/src/lib/as/as_cache.c
index 6635ebbe55b8829602f1f7edf137d62d29a5082b..117a15a99eb0df0783658d5f4564174ceeeff7e4 100644 (file)
--- a/src/lib/as/as_cache.c
+++ b/src/lib/as/as_cache.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, 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.
  *
  *  ---
  *
@@ -31,7 +31,10 @@
  *     Steve McClure, 1998
  */
 
+#include <config.h>
+
 #include <stdlib.h>
+#include <string.h>
 #include "as.h"
 #include "optlist.h"
 
@@ -83,9 +86,9 @@ as_add_cachepath(struct as_data *adp)
     /* Note we will only allocate this once.  Afterwards, we just keep
      * zeroing it since it's rather small and we don't need to re-allocate
      * each time. */
-    if (fromhead == (struct as_frompath **)0) {
+    if (fromhead == NULL) {
        fromhead = calloc(1, sizeof(struct as_frompath *) * WORLD_Y);
-       if (fromhead == (struct as_frompath **)0)
+       if (fromhead == NULL)
            return;
     }
 
@@ -102,7 +105,7 @@ as_add_cachepath(struct as_data *adp)
        }
     } else {
        /* We must make a new one of these */
-       from = (struct as_frompath *)malloc(sizeof(struct as_frompath));
+       from = malloc(sizeof(struct as_frompath));
        if (from == NULL)
            return;
        /* And set some stuff */
@@ -115,7 +118,7 @@ as_add_cachepath(struct as_data *adp)
     }
     if (!to) {
        /* We must make a new one */
-       to = (struct as_topath *)malloc(sizeof(struct as_topath));
+       to = malloc(sizeof(struct as_topath));
        /* We can't, sorry */
        if (to == NULL)
            return;
@@ -141,7 +144,7 @@ as_clear_cachepath(void)
     int i, j;
 
     /* Cache not used yet :) */
-    if (fromhead == (struct as_frompath **)0)
+    if (fromhead == NULL)
        return;
 
     for (j = 0; j < WORLD_Y; j++) {
@@ -152,15 +155,15 @@ as_clear_cachepath(void)
                    /* Free this path */
                    as_free_path(to->path);
                    /* Free this node */
-                   free((s_char *)to);
+                   free(to);
                }
            }
            /* Now, free the list of lists */
-           free((s_char *)from->tolist);
+           free(from->tolist);
            /* Save the next pointer */
            from2 = from->next;
            /* now, free this from node */
-           free((s_char *)from);
+           free(from);
        }
     }
     /* Note we don't free the fromhead here, we just zero it.  That way,
@@ -176,20 +179,20 @@ as_find_cachepath(coord fx, coord fy, coord tx, coord ty)
 
     /* Is the cache on?  if not, return NULL */
     if (as_cachepath_on == 0)
-       return (NULL);
+       return NULL;
 
     /* Do we have any cached? */
-    if (fromhead == (struct as_frompath **)0)
-       return (NULL);
+    if (fromhead == NULL)
+       return NULL;
 
     /* Yes! */
     for (from = fromhead[fy]; from; from = from->next) {
        if (from->x == fx) {
            for (to = from->tolist[ty]; to; to = to->next) {
                if (to->x == tx)
-                   return (to->path);
+                   return to->path;
            }
        }
     }
-    return (NULL);
+    return NULL;
 }