From e4c61ea6e2933ecb88a4d85538e120877cba2220 Mon Sep 17 00:00:00 2001 From: bde Date: Mon, 13 Sep 1999 14:00:16 +0000 Subject: Oops, I forgot to commit this together with the updates to the callers. Removed diskerr()'s unused d_name arg and updated callers. This fixes warnings caused by the arg having the wrong type (not const enough). The arg was also wrong (a full name instead of a short one) for calls from from subr_diskmbr.c and pc98/diskslice_machdep.c. --- sys/sys/disklabel.h | 4 ++-- sys/sys/diskmbr.h | 4 ++-- sys/sys/diskpc98.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 6f4087e..712f8e7 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -444,8 +444,8 @@ struct buf_queue_head; int bounds_check_with_label __P((struct buf *bp, struct disklabel *lp, int wlabel)); -void diskerr __P((struct buf *bp, char *dname, char *what, int pri, - int blkdone, struct disklabel *lp)); +void diskerr __P((struct buf *bp, char *what, int pri, int blkdone, + struct disklabel *lp)); void disksort __P((struct buf *ap, struct buf *bp)); u_int dkcksum __P((struct disklabel *lp)); char *readdisklabel __P((dev_t dev, struct disklabel *lp)); diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h index 6f4087e..712f8e7 100644 --- a/sys/sys/diskmbr.h +++ b/sys/sys/diskmbr.h @@ -444,8 +444,8 @@ struct buf_queue_head; int bounds_check_with_label __P((struct buf *bp, struct disklabel *lp, int wlabel)); -void diskerr __P((struct buf *bp, char *dname, char *what, int pri, - int blkdone, struct disklabel *lp)); +void diskerr __P((struct buf *bp, char *what, int pri, int blkdone, + struct disklabel *lp)); void disksort __P((struct buf *ap, struct buf *bp)); u_int dkcksum __P((struct disklabel *lp)); char *readdisklabel __P((dev_t dev, struct disklabel *lp)); diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h index 6f4087e..712f8e7 100644 --- a/sys/sys/diskpc98.h +++ b/sys/sys/diskpc98.h @@ -444,8 +444,8 @@ struct buf_queue_head; int bounds_check_with_label __P((struct buf *bp, struct disklabel *lp, int wlabel)); -void diskerr __P((struct buf *bp, char *dname, char *what, int pri, - int blkdone, struct disklabel *lp)); +void diskerr __P((struct buf *bp, char *what, int pri, int blkdone, + struct disklabel *lp)); void disksort __P((struct buf *ap, struct buf *bp)); u_int dkcksum __P((struct disklabel *lp)); char *readdisklabel __P((dev_t dev, struct disklabel *lp)); -- cgit v1.1