Remove the need for -Wno-pointer-sign. Object diffs checked.

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

diff --git a/trek/systemname.c b/trek/systemname.c
index de16077a35d89e42c48adab7a3b129270e118c95..0eabec2438612410248c713e1e39ddd547ea55c4 100644 (file)
--- a/trek/systemname.c
+++ b/trek/systemname.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: systemname.c,v 1.9 2009/05/25 00:05:56 dholland Exp $  */
+

 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -31,11 +29,17 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)systemname.c       5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)systemname.c       8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: systemname.c,v 1.9 2009/05/25 00:05:56 dholland Exp $");
+#endif

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include      "trek.h"
+#include <stddef.h>
+#include "trek.h"

 
 /*
 **  RETRIEVE THE STARSYSTEM NAME
 
 /*
 **  RETRIEVE THE STARSYSTEM NAME


@@ -48,11 +52,11 @@ static char sccsid[] = "@(#)systemname.c    5.4 (Berkeley) 6/1/90";
 **     starsystems, etc.
 */
 
 **     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;
 
 
        q = q1;
 


@@ -62,6 +66,6 @@ struct quad   *q1;
 
        i &= Q_SYSTEM;
        if (i == 0)
 
        i &= Q_SYSTEM;
        if (i == 0)

-               return (0);
+               return NULL;

        return (Systemname[i]);
 }
        return (Systemname[i]);
 }