summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1999-09-13 14:00:16 +0000
committerbde <bde@FreeBSD.org>1999-09-13 14:00:16 +0000
commite4c61ea6e2933ecb88a4d85538e120877cba2220 (patch)
tree005bc29387785aa3f90b3634c6756abfd36be3c2
parentd01e107d023c60aa27d853d0951acaecc174d2bc (diff)
downloadFreeBSD-src-e4c61ea6e2933ecb88a4d85538e120877cba2220.zip
FreeBSD-src-e4c61ea6e2933ecb88a4d85538e120877cba2220.tar.gz
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.
-rw-r--r--sys/sys/disklabel.h4
-rw-r--r--sys/sys/diskmbr.h4
-rw-r--r--sys/sys/diskpc98.h4
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));
OpenPOWER on IntegriCloud