Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -Wshadow and -Wcast-qual fallout.

Browse Source
This commit is contained in:
scw 2005-06-03 08:52:55 +00:00
parent ed71b1e86c
commit f479c18874
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/mvme68k/mvme68k/disksubr.c
View File

@ -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 @@ static void cputobsdlabel __P((struct disklabel *lp,
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 @@ readdisklabel(dev, strat, lp, clp)
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 @@ cputobsdlabel(lp, clp)
static void
printlp(lp, str)
struct disklabel *lp;
char *str;
const char *str;
{
int i;
@ -481,9 +481,9 @@ printlp(lp, str)
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 @@ printclp(clp, str)
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;