Module Name: src
Committed By: rillig
Date: Thu Aug 22 20:46:40 UTC 2024
Modified Files:
src/games/backgammon: Makefile.inc
src/games/backgammon/backgammon: backlocal.h main.c text.c version.c
src/games/backgammon/common_source: allow.c back.h fancy.c init.c
src/games/backgammon/teachgammon: teach.c tutor.c
Log Message:
backgammon: fix lint warnings
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/games/backgammon/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/games/backgammon/backgammon/backlocal.h
cvs rdiff -u -r1.35 -r1.36 src/games/backgammon/backgammon/main.c
cvs rdiff -u -r1.9 -r1.10 src/games/backgammon/backgammon/text.c
cvs rdiff -u -r1.7 -r1.8 src/games/backgammon/backgammon/version.c
cvs rdiff -u -r1.8 -r1.9 src/games/backgammon/common_source/allow.c
cvs rdiff -u -r1.23 -r1.24 src/games/backgammon/common_source/back.h
cvs rdiff -u -r1.18 -r1.19 src/games/backgammon/common_source/fancy.c
cvs rdiff -u -r1.10 -r1.11 src/games/backgammon/common_source/init.c
cvs rdiff -u -r1.25 -r1.26 src/games/backgammon/teachgammon/teach.c
cvs rdiff -u -r1.12 -r1.13 src/games/backgammon/teachgammon/tutor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/Makefile.inc
diff -u src/games/backgammon/Makefile.inc:1.8 src/games/backgammon/Makefile.inc:1.9
--- src/games/backgammon/Makefile.inc:1.8 Sat Oct 13 19:25:22 2012
+++ src/games/backgammon/Makefile.inc Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2012/10/13 19:25:22 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.9 2024/08/22 20:46:40 rillig Exp $
.include <bsd.own.mk>
@@ -9,4 +9,6 @@ LDADD+= -L${LIBCOMMON} -lcommon -ltermin
HIDEGAME=hidegame
+LINTFLAGS+= -w # turn warnings into errors
+
.include "../Makefile.inc"
Index: src/games/backgammon/backgammon/backlocal.h
diff -u src/games/backgammon/backgammon/backlocal.h:1.5 src/games/backgammon/backgammon/backlocal.h:1.6
--- src/games/backgammon/backgammon/backlocal.h:1.5 Sat Oct 13 19:19:38 2012
+++ src/games/backgammon/backgammon/backlocal.h Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: backlocal.h,v 1.5 2012/10/13 19:19:38 dholland Exp $ */
+/* $NetBSD: backlocal.h,v 1.6 2024/08/22 20:46:40 rillig Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,6 +29,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+struct move;
+
+extern const char *const instr[];
+extern const char *const message[];
+
void dble(void);
int dblgood(void);
int freemen(int);
Index: src/games/backgammon/backgammon/main.c
diff -u src/games/backgammon/backgammon/main.c:1.35 src/games/backgammon/backgammon/main.c:1.36
--- src/games/backgammon/backgammon/main.c:1.35 Mon Apr 4 19:33:44 2022
+++ src/games/backgammon/backgammon/main.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.35 2022/04/04 19:33:44 andvar Exp $ */
+/* $NetBSD: main.c,v 1.36 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: main.c,v 1.35 2022/04/04 19:33:44 andvar Exp $");
+__RCSID("$NetBSD: main.c,v 1.36 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
@@ -115,7 +115,7 @@ main(int argc __unused, char **argv)
if (tflag)
begscr = 0;
t = time(NULL);
- srandom(t); /* 'random' seed */
+ srandom((unsigned)t); /* 'random' seed */
/* need this now beceause getarg() may try to load a game */
mm = &mmstore;
Index: src/games/backgammon/backgammon/text.c
diff -u src/games/backgammon/backgammon/text.c:1.9 src/games/backgammon/backgammon/text.c:1.10
--- src/games/backgammon/backgammon/text.c:1.9 Mon Mar 22 05:10:19 2010
+++ src/games/backgammon/backgammon/text.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: text.c,v 1.9 2010/03/22 05:10:19 mrg Exp $ */
+/* $NetBSD: text.c,v 1.10 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,11 +34,12 @@
#if 0
static char sccsid[] = "@(#)text.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: text.c,v 1.9 2010/03/22 05:10:19 mrg Exp $");
+__RCSID("$NetBSD: text.c,v 1.10 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
#include "back.h"
+#include "backlocal.h"
const char *const instr[] = {
" If you did not notice by now, this program reacts to things as",
Index: src/games/backgammon/backgammon/version.c
diff -u src/games/backgammon/backgammon/version.c:1.7 src/games/backgammon/backgammon/version.c:1.8
--- src/games/backgammon/backgammon/version.c:1.7 Fri Jul 1 01:12:39 2005
+++ src/games/backgammon/backgammon/version.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: version.c,v 1.7 2005/07/01 01:12:39 jmc Exp $ */
+/* $NetBSD: version.c,v 1.8 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1987, 1993
@@ -34,10 +34,12 @@
#if 0
static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: version.c,v 1.7 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: version.c,v 1.8 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
+#include "backlocal.h"
+
const char *const message[] = {
"Last updated on Friday, October 10, 1997.",
0
Index: src/games/backgammon/common_source/allow.c
diff -u src/games/backgammon/common_source/allow.c:1.8 src/games/backgammon/common_source/allow.c:1.9
--- src/games/backgammon/common_source/allow.c:1.8 Sat Oct 13 19:19:38 2012
+++ src/games/backgammon/common_source/allow.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: allow.c,v 1.8 2012/10/13 19:19:38 dholland Exp $ */
+/* $NetBSD: allow.c,v 1.9 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)allow.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: allow.c,v 1.8 2012/10/13 19:19:38 dholland Exp $");
+__RCSID("$NetBSD: allow.c,v 1.9 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
@@ -44,7 +44,6 @@ int
movallow(struct move *mm)
{
int i, m, iold;
- int r;
if (mm->d0)
mswap(mm);
@@ -61,7 +60,7 @@ movallow(struct move *mm)
mm->g[i] = bar + cturn * mm->D1;
else
mm->g[i] = bar + cturn * mm->D0;
- if ((r = makmove(mm, i)) != 0) {
+ if (makmove(mm, i) != 0) {
if (mm->d0 || m == 4)
break;
mswap(mm);
@@ -105,7 +104,7 @@ movallow(struct move *mm)
else
continue;
}
- if (board[mm->p[i]] * cturn > 0 && (r = makmove(mm, i)) == 0)
+ if (board[mm->p[i]] * cturn > 0 && makmove(mm, i) == 0)
i++;
}
movback(mm, i);
Index: src/games/backgammon/common_source/back.h
diff -u src/games/backgammon/common_source/back.h:1.23 src/games/backgammon/common_source/back.h:1.24
--- src/games/backgammon/common_source/back.h:1.23 Sun Dec 12 22:20:52 2021
+++ src/games/backgammon/common_source/back.h Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: back.h,v 1.23 2021/12/12 22:20:52 andvar Exp $ */
+/* $NetBSD: back.h,v 1.24 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@
#include <termcap.h>
#include <unistd.h>
-#define rnum(r) (random()%r)
+#define rnum(r) ((int)(random()%r))
#define D0 dice[0]
#define D1 dice[1]
#define mswap(m) { \
Index: src/games/backgammon/common_source/fancy.c
diff -u src/games/backgammon/common_source/fancy.c:1.18 src/games/backgammon/common_source/fancy.c:1.19
--- src/games/backgammon/common_source/fancy.c:1.18 Sun Jun 2 12:11:36 2024
+++ src/games/backgammon/common_source/fancy.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fancy.c,v 1.18 2024/06/02 12:11:36 andvar Exp $ */
+/* $NetBSD: fancy.c,v 1.19 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fancy.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fancy.c,v 1.18 2024/06/02 12:11:36 andvar Exp $");
+__RCSID("$NetBSD: fancy.c,v 1.19 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
@@ -56,14 +56,14 @@ static void newline(void);
char PC; /* padding character */
char *BC; /* backspace sequence */
#endif
-char *CD; /* clear to end of screen sequence */
-char *CE; /* clear to end of line sequence */
-char *CL; /* clear screen sequence */
-char *CM; /* cursor movement instructions */
-char *HO; /* home cursor sequence */
-char *MC; /* column cursor movement map */
-char *ML; /* row cursor movement map */
-char *ND; /* forward cursor sequence */
+static char *CD; /* clear to end of screen sequence */
+static char *CE; /* clear to end of line sequence */
+static char *CL; /* clear screen sequence */
+static char *CM; /* cursor movement instructions */
+static char *HO; /* home cursor sequence */
+static char *MC; /* column cursor movement map */
+static char *ML; /* row cursor movement map */
+static char *ND; /* forward cursor sequence */
#if 0
char *UP; /* up cursor sequence */
#endif
@@ -450,7 +450,7 @@ newpos(void)
if (CM) { /* try CM to get there */
mode = 0;
m = (char *) tgoto(CM, c, r);
- ccount = strlen(m);
+ ccount = (int)strlen(m);
}
/* try HO and local movement */
if (HO && (n = r + c * lND + lHO) < ccount) {
@@ -504,6 +504,7 @@ newpos(void)
case -1: /* error! */
write(2, "\r\nInternal cursor error.\r\n", 26);
getout(0);
+ /* NOTREACHED */
/* direct cursor motion */
case 0:
@@ -738,15 +739,15 @@ getcaps(const char *s)
/* get pertinent lengths */
if (HO)
- lHO = strlen(HO);
+ lHO = (int)strlen(HO);
if (BC)
- lBC = strlen(BC);
+ lBC = (int)strlen(BC);
else
lBC = 1;
if (UP)
- lUP = strlen(UP);
+ lUP = (int)strlen(UP);
if (ND)
- lND = strlen(ND);
+ lND = (int)strlen(ND);
if (LI < 24 || CO < 72 || !(CL && UP && ND))
return (0);
linect = (int *) calloc(LI + 1, sizeof(int));
Index: src/games/backgammon/common_source/init.c
diff -u src/games/backgammon/common_source/init.c:1.10 src/games/backgammon/common_source/init.c:1.11
--- src/games/backgammon/common_source/init.c:1.10 Sat Oct 13 19:19:39 2012
+++ src/games/backgammon/common_source/init.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.10 2012/10/13 19:19:39 dholland Exp $ */
+/* $NetBSD: init.c,v 1.11 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: init.c,v 1.10 2012/10/13 19:19:39 dholland Exp $");
+__RCSID("$NetBSD: init.c,v 1.11 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
@@ -67,7 +67,6 @@ int rfl = 0;
const char *const color[] = {"White", "Red", "white", "red"};
-struct move gm;
const char *const *Colorptr;
const char *const *colorptr;
int *inopp;
Index: src/games/backgammon/teachgammon/teach.c
diff -u src/games/backgammon/teachgammon/teach.c:1.25 src/games/backgammon/teachgammon/teach.c:1.26
--- src/games/backgammon/teachgammon/teach.c:1.25 Sun Feb 3 03:19:25 2019
+++ src/games/backgammon/teachgammon/teach.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: teach.c,v 1.25 2019/02/03 03:19:25 mrg Exp $ */
+/* $NetBSD: teach.c,v 1.26 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: teach.c,v 1.25 2019/02/03 03:19:25 mrg Exp $");
+__RCSID("$NetBSD: teach.c,v 1.26 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
@@ -90,6 +90,7 @@ main(int argc __unused, char *argv[])
switch (i) {
case 1:
leave();
+ /* NOTREACHED */
case 2:
if ((i = wrtext(intro1)) != 0)
Index: src/games/backgammon/teachgammon/tutor.c
diff -u src/games/backgammon/teachgammon/tutor.c:1.12 src/games/backgammon/teachgammon/tutor.c:1.13
--- src/games/backgammon/teachgammon/tutor.c:1.12 Sun May 2 12:50:43 2021
+++ src/games/backgammon/teachgammon/tutor.c Thu Aug 22 20:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tutor.c,v 1.12 2021/05/02 12:50:43 rillig Exp $ */
+/* $NetBSD: tutor.c,v 1.13 2024/08/22 20:46:40 rillig Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tutor.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: tutor.c,v 1.12 2021/05/02 12:50:43 rillig Exp $");
+__RCSID("$NetBSD: tutor.c,v 1.13 2024/08/22 20:46:40 rillig Exp $");
#endif
#endif /* not lint */
@@ -66,7 +66,7 @@ tutor(struct move *mm)
colen = 5;
wrboard();
- while (1) {
+ for (;;) {
if (!brdeq(test[i].brd, board)) {
if (tflag && curr == 23)
curmove(18, 0);
