Sun May 24 23:00:46 2009 UTC ()
Remove unnecessary initialization that silenced a compiler warning in 1997.


(dholland)
diff -r1.10 -r1.11 src/games/trek/win.c
cvs diff -r1.10 -r1.11 src/games/trek/win.c (expand / switch to unified diff)

--- src/games/trek/win.c 2009/05/24 22:55:03 1.10
+++ src/games/trek/win.c 2009/05/24 23:00:46 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: win.c,v 1.10 2009/05/24 22:55:03 dholland Exp $ */ 1/* $NetBSD: win.c,v 1.11 2009/05/24 23:00:46 dholland Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1980, 1993 4 * Copyright (c) 1980, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#ifndef lint 33#ifndef lint
34#if 0 34#if 0
35static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 5/31/93"; 35static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 5/31/93";
36#else 36#else
37__RCSID("$NetBSD: win.c,v 1.10 2009/05/24 22:55:03 dholland Exp $"); 37__RCSID("$NetBSD: win.c,v 1.11 2009/05/24 23:00:46 dholland Exp $");
38#endif 38#endif
39#endif /* not lint */ 39#endif /* not lint */
40 40
41#include <stdio.h> 41#include <stdio.h>
42#include <unistd.h> 42#include <unistd.h>
43#include <setjmp.h> 43#include <setjmp.h>
44#include "trek.h" 44#include "trek.h"
45#include "getpar.h" 45#include "getpar.h"
46 46
47/* 47/*
48** Signal game won 48** Signal game won
49** 49**
50** This routine prints out the win message, arranges to print out 50** This routine prints out the win message, arranges to print out
@@ -53,27 +53,27 @@ __RCSID("$NetBSD: win.c,v 1.10 2009/05/2 @@ -53,27 +53,27 @@ __RCSID("$NetBSD: win.c,v 1.10 2009/05/2
53** asked whether or not you want another game (via the longjmp() 53** asked whether or not you want another game (via the longjmp()
54** call). 54** call).
55** 55**
56** Pretty straightforward, although the promotion algorithm is 56** Pretty straightforward, although the promotion algorithm is
57** pretty off the wall. 57** pretty off the wall.
58*/ 58*/
59 59
60extern jmp_buf env; 60extern jmp_buf env;
61 61
62void 62void
63win(void) 63win(void)
64{ 64{
65 long s; 65 long s;
66 const struct cvntab *p = NULL; 66 const struct cvntab *p;
67 67
68 sleep(1); 68 sleep(1);
69 printf("\nCongratulations, you have saved the Federation\n"); 69 printf("\nCongratulations, you have saved the Federation\n");
70 Move.endgame = 1; 70 Move.endgame = 1;
71 71
72 /* print and return the score */ 72 /* print and return the score */
73 s = score(); 73 s = score();
74 74
75 /* decide if she gets a promotion */ 75 /* decide if she gets a promotion */
76 if (Game.helps == 0 && Game.killb == 0 && Game.killinhab == 0 && 76 if (Game.helps == 0 && Game.killb == 0 && Game.killinhab == 0 &&
77 5 * Game.kills + Game.deaths < 100 && 77 5 * Game.kills + Game.deaths < 100 &&
78 s >= 1000 && Ship.ship == ENTERPRISE) { 78 s >= 1000 && Ship.ship == ENTERPRISE) {
79 printf("In fact, you are promoted one step in rank,\n"); 79 printf("In fact, you are promoted one step in rank,\n");