Pass -Wstrict-overflow, and while here, don't read from index -1 of

an array.

1 files changed, 16 insertions, 16 deletions

diff --git a/cribbage/io.c b/cribbage/io.c
index ed750784..cc1243df 100644
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.26 2011/05/23 22:48:52 joerg Exp $	*/
+/*	$NetBSD: io.c,v 1.27 2012/10/13 20:36:06 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: io.c,v 1.26 2011/05/23 22:48:52 joerg Exp $");
+__RCSID("$NetBSD: io.c,v 1.27 2012/10/13 20:36:06 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: io.c,v 1.26 2011/05/23 22:48:52 joerg Exp $");
 #define	CTRL(X)			(X - 'A' + 1)
 
 static int msgcrd(CARD, BOOLEAN, const char *, BOOLEAN);
-static void printcard(WINDOW *, int, CARD, BOOLEAN);
+static void printcard(WINDOW *, unsigned, CARD, BOOLEAN);
 static int incard(CARD *);
 static void wait_for(int);
 static int readchar(void);
@@ -121,7 +121,7 @@ msgcrd(CARD c, BOOLEAN brfrank, const char *mid, BOOLEAN brfsuit)
  *	Print out a card.
  */
 static void
-printcard(WINDOW *win, int cardno, CARD c, BOOLEAN blank)
+printcard(WINDOW *win, unsigned cardno, CARD c, BOOLEAN blank)
 {
 	prcard(win, cardno * 2, cardno, c, blank);
 }
@@ -154,9 +154,9 @@ prcard(WINDOW *win, int y, int x, CARD c, BOOLEAN blank)
  *	Print a hand of n cards
  */
 void
-prhand(const CARD h[], int n, WINDOW *win, BOOLEAN blank)
+prhand(const CARD h[], unsigned n, WINDOW *win, BOOLEAN blank)
 {
-	int i;
+	unsigned i;
 
 	werase(win);
 	for (i = 0; i < n; i++)
@@ -519,7 +519,7 @@ over:
 char *
 get_line(void)
 {
-	char *sp;
+	size_t pos;
 	int c, oy, ox;
 	WINDOW *oscr;
 
@@ -528,36 +528,36 @@ get_line(void)
 	getyx(stdscr, oy, ox);
 	refresh();
 	/* loop reading in the string, and put it in a temporary buffer */
-	for (sp = linebuf; (c = readchar()) != '\n'; clrtoeol(), refresh()) {
+	for (pos = 0; (c = readchar()) != '\n'; clrtoeol(), refresh()) {
 			if (c == erasechar()) {	/* process erase character */
-				if (sp > linebuf) {
+				if (pos > 0) {
 					int i;
 
-					sp--;
-					for (i = strlen(unctrl(*sp)); i; i--)
+					pos--;
+					for (i = strlen(unctrl(linebuf[pos])); i; i--)
 						addch('\b');
 				}
 				continue;
 			} else
 				if (c == killchar()) {	/* process kill
 							 * character */
-					sp = linebuf;
+					pos = 0;
 					move(oy, ox);
 					continue;
 				} else
-					if (sp == linebuf && c == ' ')
+					if (pos == 0 && c == ' ')
 						continue;
-		if (sp >= &linebuf[LINESIZE - 1] || !(isprint(c) || c == ' '))
+		if (pos >= LINESIZE - 1 || !(isprint(c) || c == ' '))
 			putchar(CTRL('G'));
 		else {
 			if (islower(c))
 				c = toupper(c);
-			*sp++ = c;
+			linebuf[pos++] = c;
 			addstr(unctrl(c));
 			Mpos++;
 		}
 	}
-	*sp = '\0';
+	linebuf[pos] = '\0';
 	stdscr = oscr;
 	return (linebuf);
 }