CVS commit: src/usr.bin/crunch/crunchgen

[Luke Mewburn]

Module Name:    src
Committed By:   lukem
Date:           Tue Apr 14 22:03:07 UTC 2009

Modified Files:
        src/usr.bin/crunch/crunchgen: crunchgen.c mkskel.sh

Log Message:
Fix WARNS=4 issues (-Wshadow -Wcast-qual)


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/crunch/crunchgen/crunchgen.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/crunch/crunchgen/mkskel.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/crunch/crunchgen/crunchgen.c
diff -u src/usr.bin/crunch/crunchgen/crunchgen.c:1.74 src/usr.bin/crunch/crunchgen/crunchgen.c:1.75
--- src/usr.bin/crunch/crunchgen/crunchgen.c:1.74	Sun Oct 19 22:10:05 2008
+++ src/usr.bin/crunch/crunchgen/crunchgen.c	Tue Apr 14 22:03:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: crunchgen.c,v 1.74 2008/10/19 22:10:05 apb Exp $	*/
+/*	$NetBSD: crunchgen.c,v 1.75 2009/04/14 22:03:07 lukem Exp $	*/
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: crunchgen.c,v 1.74 2008/10/19 22:10:05 apb Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.75 2009/04/14 22:03:07 lukem Exp $");
 #endif
 
 #include <stdlib.h>
@@ -100,7 +100,7 @@
 int linenum = -1;
 int goterror = 0;
 
-char *pname = "crunchgen";
+const char *pname = "crunchgen";
 
 int verbose, readcache, useobjs, oneobj;	/* options */
 int reading_cache;
@@ -111,11 +111,11 @@
 
 /* general library routines */
 
-void status(char *str);
+void status(const char *str);
 void out_of_memory(void);
 void add_string(strlst_t **listp, char *str);
-int is_dir(char *pathname);
-int is_nonempty_file(char *pathname);
+int is_dir(const char *pathname);
+int is_nonempty_file(const char *pathname);
 
 /* helper routines for main() */
 
@@ -316,11 +316,11 @@
 
 
 void 
-parse_line(char *line, int *fc, char **fv, int nf)
+parse_line(char *pline, int *fc, char **fv, int nf)
 {
     char *p;
 
-    p = line;
+    p = pline;
     *fc = 0;
     for (;;) {
 	while (isspace((unsigned char)*p))
@@ -1071,7 +1071,7 @@
  */
 
 void
-status(char *str)
+status(const char *str)
 {
     static int lastlen = 0;
     int len, spaces;
@@ -1124,7 +1124,7 @@
 
 
 int
-is_dir(char *pathname)
+is_dir(const char *pathname)
 {
     struct stat buf;
 
@@ -1134,7 +1134,7 @@
 }
 
 int
-is_nonempty_file(char *pathname)
+is_nonempty_file(const char *pathname)
 {
     struct stat buf;
 

Index: src/usr.bin/crunch/crunchgen/mkskel.sh
diff -u src/usr.bin/crunch/crunchgen/mkskel.sh:1.2 src/usr.bin/crunch/crunchgen/mkskel.sh:1.3
--- src/usr.bin/crunch/crunchgen/mkskel.sh:1.2	Sat Aug  2 21:30:13 1997
+++ src/usr.bin/crunch/crunchgen/mkskel.sh	Tue Apr 14 22:03:07 2009
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-#	$NetBSD: mkskel.sh,v 1.2 1997/08/02 21:30:13 perry Exp $
+#	$NetBSD: mkskel.sh,v 1.3 2009/04/14 22:03:07 lukem Exp $
 
 # idea and sed lines taken straight from flex
 
 cat <<!EOF
 /* File created via mkskel.sh */
 
-char *crunched_skel[] = {
+const char *crunched_skel[] = {
 !EOF
 
 sed 's/\\/&&/g' $* | sed 's/"/\\"/g' | sed 's/.*/  "&",/'