[src/trunk]: src/sys/arch/mvme68k/mvme68k Fix -Wshadow and -Wcast-qual fallout.

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e95d669215e0
branches:  trunk
changeset: 581605:e95d669215e0
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jun 03 08:52:55 2005 +0000

description:
Fix -Wshadow and -Wcast-qual fallout.

diffstat:

 sys/arch/mvme68k/mvme68k/disksubr.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r 0b59710bbf1a -r e95d669215e0 sys/arch/mvme68k/mvme68k/disksubr.c
--- a/sys/arch/mvme68k/mvme68k/disksubr.c       Fri Jun 03 08:51:08 2005 +0000
+++ b/sys/arch/mvme68k/mvme68k/disksubr.c       Fri Jun 03 08:52:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.27 2004/02/13 11:36:15 wiz Exp $        */
+/*     $NetBSD: disksubr.c,v 1.28 2005/06/03 08:52:55 scw Exp $        */
 
 /*
  * Copyright (c) 1995 Dale Rahn.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.27 2004/02/13 11:36:15 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2005/06/03 08:52:55 scw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,8 +57,8 @@
        struct cpu_disklabel *clp));
 
 #ifdef DEBUG
-static void printlp __P((struct disklabel *lp, char *str));
-static void printclp __P((struct cpu_disklabel *clp, char *str));
+static void printlp __P((struct disklabel *lp, const char *str));
+static void printclp __P((struct cpu_disklabel *clp, const char *str));
 #endif
 
 
@@ -78,7 +78,7 @@
        struct cpu_disklabel *clp;
 {
        struct buf *bp;
-       char *msg = NULL;
+       const char *msg = NULL;
 
        /* obtain buffer to probe drive with */
        bp = geteblk((int)lp->d_secsize);
@@ -457,7 +457,7 @@
 static void
 printlp(lp, str)
        struct disklabel *lp;
-       char *str;
+       const char *str;
 {
        int i;
 
@@ -481,9 +481,9 @@
 static void
 printclp(clp, str)
        struct cpu_disklabel *clp;
-       char *str;
+       const char *str;
 {
-       int max, i;
+       int maxp, i;
 
        printf("%s\n", str);
        printf("magic1 %lx\n", clp->magic1);
@@ -492,8 +492,8 @@
        printf("secsize %x nsect %x ntrack %x ncylinders %x\n",
            clp->cfg_psm, clp->cfg_spt, clp->cfg_hds, clp->cfg_trk);
        printf("Num partitions %x\n", clp->partitions);
-       max = clp->partitions < 16 ? clp->partitions : 16;
-       for (i = 0; i < max; i++) {
+       maxp = clp->partitions < 16 ? clp->partitions : 16;
+       for (i = 0; i < maxp; i++) {
                struct partition *part;
                const char *fstyp;