Null for pointers, not 0.

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

diff --git a/trek/setwarp.c b/trek/setwarp.c
index 74939ae6cc2c32e4b7ca21996d4dd870859b3067..b0ab045399c2c9d73dff335105b8938c0eccf076 100644 (file)
--- a/trek/setwarp.c
+++ b/trek/setwarp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: setwarp.c,v 1.3 1995/04/22 10:59:27 cgd Exp $  */
+/*     $NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 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,16 +29,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)setwarp.c  8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: setwarp.c,v 1.3 1995/04/22 10:59:27 cgd Exp $";
+__RCSID("$NetBSD: setwarp.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
-# include      "getpar.h"
+#include <stdio.h>
+#include "trek.h"
+#include "getpar.h"
 
 /*
 **  SET WARP FACTOR
@@ -51,17 +49,23 @@ static char rcsid[] = "$NetBSD: setwarp.c,v 1.3 1995/04/22 10:59:27 cgd Exp $";
 **     checked for consistancy.
 */
 
-setwarp()
+/*ARGSUSED*/
+void
+setwarp(int v __unused)
 {
        double  warpfac;
 
        warpfac = getfltpar("Warp factor");
        if (warpfac < 0.0)
                return;
-       if (warpfac < 1.0)
-               return (printf("Minimum warp speed is 1.0\n"));
-       if (warpfac > 10.0)
-               return (printf("Maximum speed is warp 10.0\n"));
+       if (warpfac < 1.0) {
+               printf("Minimum warp speed is 1.0\n");
+               return;
+       }
+       if (warpfac > 10.0) {
+               printf("Maximum speed is warp 10.0\n");
+               return;
+       }
        if (warpfac > 6.0)
                printf("Damage to warp engines may occur above warp 6.0\n");
        Ship.warp = warpfac;