From 04f4d7044367099914cf1906ae27ac20c24e44cf Mon Sep 17 00:00:00 2001 From: jsm Date: Wed, 8 Sep 1999 21:17:44 +0000 Subject: Add use of `const' where appropriate to the games. This merges in all such remaining changes from the Linux port of the NetBSD games, except in hunt (where substantial changes from OpenBSD need to be looked at). Some such changes were previously covered in PRs bin/6041, bin/6146, bin/6148, bin/6150, bin/6151, bin/6580, bin/6660, bin/7993, bin/7994, bin/8039, bin/8057 and bin/8093. --- hangman/extern.c | 9 +++++---- hangman/hangman.h | 7 ++++--- hangman/setup.c | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'hangman') diff --git a/hangman/extern.c b/hangman/extern.c index 59a310fa..a412fe9b 100644 --- a/hangman/extern.c +++ b/hangman/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.4 1997/10/11 01:16:27 lukem Exp $ */ +/* $NetBSD: extern.c,v 1.5 1999/09/08 21:17:50 jsm Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.4 1997/10/11 01:16:27 lukem Exp $"); +__RCSID("$NetBSD: extern.c,v 1.5 1999/09/08 21:17:50 jsm Exp $"); #endif #endif /* not lint */ @@ -46,7 +46,8 @@ __RCSID("$NetBSD: extern.c,v 1.4 1997/10/11 01:16:27 lukem Exp $"); bool Guessed[26]; -char Word[BUFSIZ], Known[BUFSIZ], *Noose_pict[] = { +char Word[BUFSIZ], Known[BUFSIZ]; +const char *const Noose_pict[] = { " ______", " | |", " |", @@ -63,7 +64,7 @@ int Errors, Wordnum = 0; double Average = 0.0; -ERR_POS Err_pos[MAXERRS] = { +const ERR_POS Err_pos[MAXERRS] = { {2, 10, 'O'}, {3, 10, '|'}, {4, 10, '|'}, diff --git a/hangman/hangman.h b/hangman/hangman.h index 10ade2a9..e9aa4f57 100644 --- a/hangman/hangman.h +++ b/hangman/hangman.h @@ -1,4 +1,4 @@ -/* $NetBSD: hangman.h,v 1.7 1998/09/11 13:42:03 hubertf Exp $ */ +/* $NetBSD: hangman.h,v 1.8 1999/09/08 21:17:50 jsm Exp $ */ /* * Copyright (c) 1983, 1993 @@ -69,13 +69,14 @@ typedef struct { extern bool Guessed[]; -extern char Word[], Known[], *Noose_pict[]; +extern char Word[], Known[]; +extern const char *const Noose_pict[]; extern int Errors, Wordnum; extern double Average; -extern ERR_POS Err_pos[]; +extern const ERR_POS Err_pos[]; extern FILE *Dict; diff --git a/hangman/setup.c b/hangman/setup.c index a0f003b2..4ba9f7df 100644 --- a/hangman/setup.c +++ b/hangman/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.5 1997/10/11 08:01:06 lukem Exp $ */ +/* $NetBSD: setup.c,v 1.6 1999/09/08 21:17:50 jsm Exp $ */ /*- * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: setup.c,v 1.5 1997/10/11 08:01:06 lukem Exp $"); +__RCSID("$NetBSD: setup.c,v 1.6 1999/09/08 21:17:50 jsm Exp $"); #endif #endif /* not lint */ @@ -52,7 +52,7 @@ __RCSID("$NetBSD: setup.c,v 1.5 1997/10/11 08:01:06 lukem Exp $"); void setup() { - char **sp; + const char *const *sp; static struct stat sbuf; noecho(); -- cgit v1.2.3