From b27968d204485e4c53a81f93c860842844de05ab Mon Sep 17 00:00:00 2001
From: rpaulo <rpaulo@NetBSD.org>
Date: Tue, 9 Aug 2005 09:15:23 +0000
Subject: Enable WARNS=3 and pass lint(1).

ok christos@
---
 rain/Makefile |  3 ++-
 rain/rain.c   | 47 ++++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

(limited to 'rain')

diff --git a/rain/Makefile b/rain/Makefile
index 9f7cc8f6..2e324075 100644
--- a/rain/Makefile
+++ b/rain/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.8 1999/07/30 02:14:56 hubertf Exp $
+#	$NetBSD: Makefile,v 1.9 2005/08/09 09:15:23 rpaulo Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
+WARNS=	3
 PROG=	rain
 MAN=	rain.6
 DPADD=	${LIBCURSES}
diff --git a/rain/rain.c b/rain/rain.c
index 450778d8..9be00376 100644
--- a/rain/rain.c
+++ b/rain/rain.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rain.c,v 1.17 2004/05/02 21:31:23 christos Exp $	*/
+/*	$NetBSD: rain.c,v 1.18 2005/08/09 09:15:23 rpaulo Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)rain.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: rain.c,v 1.17 2004/05/02 21:31:23 christos Exp $");
+__RCSID("$NetBSD: rain.c,v 1.18 2005/08/09 09:15:23 rpaulo Exp $");
 #endif
 #endif /* not lint */
 
@@ -93,7 +93,7 @@ main(int argc, char **argv)
 			return 1;
 		}
 
-	initscr();
+	(void)initscr();
 	cols = COLS - 4;
 	lines = LINES - 4;
 
@@ -101,49 +101,50 @@ main(int argc, char **argv)
 	(void)signal(SIGINT, onsig);
 	(void)signal(SIGTERM, onsig);
 
-	curs_set(0);
+	(void)curs_set(0);
 	for (j = 4; j >= 0; --j) {
 		xpos[j] = random() % cols + 2;
 		ypos[j] = random() % lines + 2;
 	}
 	for (j = 0;;) {
 		if (sig_caught) {
-			endwin();
+			(void)endwin();
 			exit(0);
 		}
 		x = random() % cols + 2;
 		y = random() % lines + 2;
-		mvaddch(y, x, '.');
-		mvaddch(ypos[j], xpos[j], 'o');
+		(void)mvaddch(y, x, '.');
+		(void)mvaddch(ypos[j], xpos[j], 'o');
 		if (!j--)
 			j = 4;
-		mvaddch(ypos[j], xpos[j], 'O');
+		(void)mvaddch(ypos[j], xpos[j], 'O');
 		if (!j--)
 			j = 4;
-		mvaddch(ypos[j] - 1, xpos[j], '-');
-		mvaddstr(ypos[j], xpos[j] - 1, "|.|");
-		mvaddch(ypos[j] + 1, xpos[j], '-');
+		(void)mvaddch(ypos[j] - 1, xpos[j], '-');
+		(void)mvaddstr(ypos[j], xpos[j] - 1, "|.|");
+		(void)mvaddch(ypos[j] + 1, xpos[j], '-');
 		if (!j--)
 			j = 4;
-		mvaddch(ypos[j] - 2, xpos[j], '-');
-		mvaddstr(ypos[j] - 1, xpos[j] - 1, "/ \\");
-		mvaddstr(ypos[j], xpos[j] - 2, "| O |");
-		mvaddstr(ypos[j] + 1, xpos[j] - 1, "\\ /");
-		mvaddch(ypos[j] + 2, xpos[j], '-');
+		(void)mvaddch(ypos[j] - 2, xpos[j], '-');
+		(void)mvaddstr(ypos[j] - 1, xpos[j] - 1, "/ \\");
+		(void)mvaddstr(ypos[j], xpos[j] - 2, "| O |");
+		(void)mvaddstr(ypos[j] + 1, xpos[j] - 1, "\\ /");
+		(void)mvaddch(ypos[j] + 2, xpos[j], '-');
 		if (!j--)
 			j = 4;
-		mvaddch(ypos[j] - 2, xpos[j], ' ');
-		mvaddstr(ypos[j] - 1, xpos[j] - 1, "   ");
-		mvaddstr(ypos[j], xpos[j] - 2, "     ");
-		mvaddstr(ypos[j] + 1, xpos[j] - 1, "   ");
-		mvaddch(ypos[j] + 2, xpos[j], ' ');
+		(void)mvaddch(ypos[j] - 2, xpos[j], ' ');
+		(void)mvaddstr(ypos[j] - 1, xpos[j] - 1, "   ");
+		(void)mvaddstr(ypos[j], xpos[j] - 2, "     ");
+		(void)mvaddstr(ypos[j] + 1, xpos[j] - 1, "   ");
+		(void)mvaddch(ypos[j] + 2, xpos[j], ' ');
 		xpos[j] = x;
 		ypos[j] = y;
-		refresh();
-		if (delay) usleep(delay);
+		(void)refresh();
+		if (delay) (void)usleep(delay);
 	}
 }
 
+/* ARGSUSED */
 static void
 onsig(int dummy __attribute__((__unused__)))
 {
-- 
cgit v1.2.3-56-ge451