fix some lint

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

diff --git a/trek/destruct.c b/trek/destruct.c
index 6e85ef36fd4c0e989841cb71a7d0afe41192001d..6f22517b17226c9c54b0a0d6d54ba04ceb009809 100644 (file)
--- a/trek/destruct.c
+++ b/trek/destruct.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry 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
@@ -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.
- * 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.
  *
@@ -31,12 +29,20 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)destruct.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: destruct.c,v 1.2 1993/08/01 18:50:42 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)destruct.c 8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: destruct.c,v 1.8 2007/12/15 19:44:44 perry Exp $");
+#endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include "trek.h"
+#include "getpar.h"
 
 /*
 **  Self Destruct Sequence
@@ -58,14 +64,19 @@ static char rcsid[] = "$Id: destruct.c,v 1.2 1993/08/01 18:50:42 mycroft Exp $";
 **     Uses trace flag 41
 */
 
-destruct()
+/*ARGSUSED*/
+void
+destruct(v)
+       int v __unused;
 {
        char            checkpass[15];
-       register int    i, j;
+       int     i, j;
        double          zap;
 
-       if (damaged(COMPUTER))
-               return (out(COMPUTER));
+       if (damaged(COMPUTER)) {
+               out(COMPUTER);
+               return;
+       }
        printf("\n\07 --- WORKING ---\07\n");
        sleep(3);
        /* output the count 10 9 8 7 6 */
@@ -80,8 +91,10 @@ destruct()
        skiptonl(0);
        getstrpar("Enter password verification", checkpass, 14, 0);
        sleep(2);
-       if (!sequal(checkpass, Game.passwd))
-               return (printf("Self destruct sequence aborted\n"));
+       if (strcmp(checkpass, Game.passwd) != 0) {
+               printf("Self destruct sequence aborted\n");
+               return;
+       }
        printf("Password verified; self destruct sequence continues:\n");
        sleep(2);
        /* output count 5 4 3 2 1 0 */