CVS commit: src/usr.bin/xinstall

[Luke Mewburn]

Module Name:    src
Committed By:   lukem
Date:           Tue Apr 14 08:54:59 UTC 2009

Modified Files:
        src/usr.bin/xinstall: xinstall.c

Log Message:
Fix -Wshadow -Wcast-qual issues


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/usr.bin/xinstall/xinstall.c

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/xinstall/xinstall.c
diff -u src/usr.bin/xinstall/xinstall.c:1.106 src/usr.bin/xinstall/xinstall.c:1.107
--- src/usr.bin/xinstall/xinstall.c:1.106	Tue Apr  7 22:07:54 2009
+++ src/usr.bin/xinstall/xinstall.c	Tue Apr 14 08:54:59 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: xinstall.c,v 1.106 2009/04/07 22:07:54 apb Exp $	*/
+/*	$NetBSD: xinstall.c,v 1.107 2009/04/14 08:54:59 lukem Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.106 2009/04/07 22:07:54 apb Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.107 2009/04/14 08:54:59 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -94,7 +94,7 @@
 u_long	fileflags;
 char	*stripArgs;
 char	*afterinstallcmd;
-char	*suffix = BACKUP_SUFFIX;
+const char *suffix = BACKUP_SUFFIX;
 char	*destdir;
 
 enum {
@@ -890,7 +890,7 @@
 {
 	static const char exec_failure[] = ": exec of strip failed: ";
 	int	serrno, status;
-	const char *stripprog, *progname;
+	const char * volatile stripprog, *progname;
 	char *cmd;
 
 	if ((stripprog = getenv("STRIP")) == NULL) {
@@ -1064,7 +1064,7 @@
  */
 void
 metadata_log(const char *path, const char *type, struct timeval *tv,
-	const char *link, const char *digestresult, off_t size)
+	const char *slink, const char *digestresult, off_t size)
 {
 	static const char	extra[] = { ' ', '\t', '\n', '\\', '#', '\0' };
 	const char	*p;
@@ -1108,8 +1108,8 @@
 	if (group)
 		fprintf(metafp, " gname=%s", group);
 	fprintf(metafp, " mode=%#o", mode);
-	if (link) {
-		strsvis(buf, link, VIS_CSTYLE, extra);	/* encode link */
+	if (slink) {
+		strsvis(buf, slink, VIS_CSTYLE, extra);	/* encode link */
 		fprintf(metafp, " link=%s", buf);
 	}
 	if (*type == 'f') /* type=file */