>Number:         6082
>Category:       bin
>Synopsis:       [PATCH] Adventure setup.c cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bin-bug-people (Utility Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 31 14:35:01 1998
>Last-Modified:
>Originator:     Joseph Samuel Myers
>Organization:
Trinity College, University of Cambridge, UK
>Release:        NetBSD-current of 1998-08-30
>Environment:
[
System: Linux octomino 2.0.35 #1 Wed Aug 12 15:54:21 UTC 1998 i586 unknown
Architecture: i586
]
>Description:

The patch below does some minor cleanup of games/adventure/setup.c:

1) Switch to NetBSD standard __RCSID and __COPYRIGHT.
2) Include headers: <stdlib.h> and <err.h>.
3) Remove spurious newlines on strings passed to err() (in which case
I remove a terminal period as well, since a standard error message
will be appended) and errx() (USAGE).
4) Cast values used with printf %x formats to unsigned int.

>How-To-Repeat:

>Fix:

diff -ruN adventure/setup.c adventure+/setup.c
--- adventure/setup.c	Sat Oct 11 11:49:25 1997
+++ adventure+/setup.c	Mon Aug 31 21:04:26 1998
@@ -36,17 +36,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif				/* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: setup.c,v 1.4 1997/10/11 01:55:30 lukem Exp $";
+__RCSID("$NetBSD: setup.c,v 1.4 1997/10/11 01:55:30 lukem Exp $");
 #endif
 #endif				/* not lint */
 
@@ -64,15 +64,19 @@
 #define SIG2 " *      Sterday, 6 Thrimidge S.R. 1993, 15:24"
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <err.h>
 #include "hdr.h"		/* SEED lives in there; keep them coordinated. */
 
-#define USAGE "Usage: setup file > data.c (file is typically glorkz)\n"
+#define USAGE "Usage: setup file > data.c (file is typically glorkz)"
 
 #define YES 1
 #define NO  0
 
 #define LINE 10			/* How many values do we get on a line? */
 
+int main __P((int, char *[]));
+
 int
 main(argc, argv)
 	int     argc;
@@ -85,7 +89,7 @@
 		errx(1, USAGE);
 
 	if ((infile = fopen(argv[1], "r")) == NULL)
-		err(1, "Can't read file %s.\n", argv[1]);
+		err(1, "Can't read file %s", argv[1]);
 	puts("/*\n * data.c: created by setup from the ascii data file.");
 	puts(SIG1);
 	puts(SIG2);
@@ -97,7 +101,7 @@
 
 	while ((c = getc(infile)) != EOF) {
 		if (linestart && c == ' ') {	/* Convert first spaces to tab */
-			printf("0x%02x,", ('\t' ^ random()) & 0xFF);
+			printf("0x%02x,", (unsigned int)(('\t' ^ random()) & 0xFF));
 			while ((c = getc(infile)) == ' ' && c != EOF);
 			/* Drop the non-whitespace character through */
 			linestart = NO;
@@ -113,7 +117,7 @@
 		}
 		if (count++ % LINE == 0)	/* Finished a line? */
 			printf("\n\t");
-		printf("0x%02x,", (c ^ random()) & 0xFF);
+		printf("0x%02x,", (unsigned int)((c ^ random()) & 0xFF));
 	}
 	puts("\n\t0\n};");
 	fclose(infile);
>Audit-Trail:
>Unformatted: