Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/games fix issues found by GCC 6.4:
details: https://anonhg.NetBSD.org/src/rev/4c131b6a4069
branches: trunk
changeset: 359194:4c131b6a4069
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Feb 04 08:48:05 2018 +0000
description:
fix issues found by GCC 6.4:
battlestar was missing some {} in its insane printf()+puts() usage.
this is a literal code sequence i found:
printf("The blast catches ");
printf("the goddess in the ");
printf("stomach, knocking ");
puts("her to the ground.");
printf("She writhes in the ");
printf("dirt as the agony of ");
puts("death taunts her.");
puts("She has stopped moving.");
no lines inserted or removed.
tetris' checkscores() had wrong and missing {} usage.
diffstat:
games/battlestar/command3.c | 7 ++++---
games/battlestar/command7.c | 7 ++++---
games/tetris/scores.c | 5 +++--
3 files changed, 11 insertions(+), 8 deletions(-)
diffs (79 lines):
diff -r 1f12a8e0dcca -r 4c131b6a4069 games/battlestar/command3.c
--- a/games/battlestar/command3.c Sun Feb 04 08:44:36 2018 +0000
+++ b/games/battlestar/command3.c Sun Feb 04 08:48:05 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: command3.c,v 1.3 2005/07/01 06:04:54 jmc Exp $ */
+/* $NetBSD: command3.c,v 1.4 2018/02/04 08:48:05 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)com3.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: command3.c,v 1.3 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: command3.c,v 1.4 2018/02/04 08:48:05 mrg Exp $");
#endif
#endif /* not lint */
@@ -306,9 +306,10 @@
if (wintime)
live();
break;
- } else
+ } else {
printf("I don't see any ");
puts("goddess around here.");
+ }
break;
case TIMER:
diff -r 1f12a8e0dcca -r 4c131b6a4069 games/battlestar/command7.c
--- a/games/battlestar/command7.c Sun Feb 04 08:44:36 2018 +0000
+++ b/games/battlestar/command7.c Sun Feb 04 08:48:05 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: command7.c,v 1.3 2005/07/01 06:04:54 jmc Exp $ */
+/* $NetBSD: command7.c,v 1.4 2018/02/04 08:48:05 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)com7.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: command7.c,v 1.3 2005/07/01 06:04:54 jmc Exp $");
+__RCSID("$NetBSD: command7.c,v 1.4 2018/02/04 08:48:05 mrg Exp $");
#endif
#endif /* not lint */
@@ -273,9 +273,10 @@
}
if (lifeline >= strength) {
printf("You have killed the %s.\n", objsht[enemy]);
- if (enemy == ELF || enemy == DARK)
+ if (enemy == ELF || enemy == DARK) {
printf("A watery black smoke consumes his body and ");
puts("then vanishes with a peal of thunder!");
+ }
clearbit(location[position].objects, enemy);
power += 2;
notes[JINXED]++;
diff -r 1f12a8e0dcca -r 4c131b6a4069 games/tetris/scores.c
--- a/games/tetris/scores.c Sun Feb 04 08:44:36 2018 +0000
+++ b/games/tetris/scores.c Sun Feb 04 08:48:05 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scores.c,v 1.22 2014/03/22 19:05:30 dholland Exp $ */
+/* $NetBSD: scores.c,v 1.23 2018/02/04 08:48:05 mrg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -830,7 +830,8 @@
continue;
}
}
- if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
+ }
+ if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
levelfound[sp->hs_level] = 1;
i++, sp++;
}
Home |
Main Index |
Thread Index |
Old Index