Revert to the original phrasing, but remove the man 8 section reference.

[bsdgames-darwin.git] / trek / systemname.c

diff --git a/trek/systemname.c b/trek/systemname.c
index cb4efa49a852fb38361619bbe486dec191bf13ea..0eabec2438612410248c713e1e39ddd547ea55c4 100644 (file)
--- a/trek/systemname.c
+++ b/trek/systemname.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: systemname.c,v 1.3 1995/04/22 10:59:32 cgd Exp $       */
+/*     $NetBSD: systemname.c,v 1.9 2009/05/25 00:05:56 dholland Exp $  */
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,15 +29,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)systemname.c       8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: systemname.c,v 1.3 1995/04/22 10:59:32 cgd Exp $";
+__RCSID("$NetBSD: systemname.c,v 1.9 2009/05/25 00:05:56 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stddef.h>
+#include "trek.h"
 
 /*
 **  RETRIEVE THE STARSYSTEM NAME
@@ -54,11 +52,11 @@ static char rcsid[] = "$NetBSD: systemname.c,v 1.3 1995/04/22 10:59:32 cgd Exp $
 **     starsystems, etc.
 */
 
-char *systemname(q1)
-struct quad    *q1;
+const char *
+systemname(const struct quad *q1)
 {
-       register struct quad    *q;
-       register int            i;
+       const struct quad       *q;
+       int             i;
 
        q = q1;
 
@@ -68,6 +66,6 @@ struct quad   *q1;
 
        i &= Q_SYSTEM;
        if (i == 0)
-               return (0);
+               return NULL;
        return (Systemname[i]);
 }