Fix trailing whitespace

[empserver] / src / lib / player / nat.c

diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c
index 73005d6fb4e86aff409ded90758a1dc56cd96ad2..b31a28e06fde45340e3e1c321ca4e0c0486e1e6d 100644 (file)
--- a/src/lib/player/nat.c
+++ b/src/lib/player/nat.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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,50 +19,49 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  nat.c: Get nation stuff
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  */
 
-#include "prototypes.h"
-#include "misc.h"
-#include "nat.h"
+#include <config.h>
+
 #include "file.h"
-#include "player.h"
-#include <fcntl.h>
+#include "nat.h"
+#include "prototypes.h"
 
 int
-natbyname(s_char *name, natid *result)
+natbyname(char *name, natid *result)
 {
-       struct  natstr *np;
-       int     i;
+    struct natstr *np;
+    int i;
 
-       for (i=0; NULL != (np = getnatp(i)); i++) {
-               if (strcmp(np->nat_cnam, name) == 0) {
-                       *result = i;
-                       return 0;
-               }
+    for (i = 0; NULL != (np = getnatp(i)); i++) {
+       if (np->nat_stat != STAT_UNUSED && !strcmp(np->nat_cnam, name)) {
+           *result = i;
+           return 0;
        }
-       *result = 255;
-       return -1;
+    }
+    *result = NATID_BAD;
+    return -1;
 }
 
 int
-natpass(int cn, s_char *pass)
+natpass(int cn, char *pass)
 {
-       struct  natstr *np;
+    struct natstr *np;
 
-       np = getnatp((natid)cn);
-       if (np->nat_stat == VIS)
-               return 1;
-       if (strcmp(np->nat_pnam, pass) == 0)
-               return 1;
-       return 0;
+    np = getnatp((natid)cn);
+    if (np->nat_stat == STAT_VIS)
+       return 1;
+    if (strcmp(np->nat_pnam, pass) == 0)
+       return 1;
+    return 0;
 }