From owner-cvs-all Fri Sep 20 5:52: 6 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51A9937B401; Fri, 20 Sep 2002 05:52:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E308943E3B; Fri, 20 Sep 2002 05:52:03 -0700 (PDT) (envelope-from phk@FreeBSD.org) Received: from freefall.freebsd.org (phk@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8KCq3Co061191; Fri, 20 Sep 2002 05:52:03 -0700 (PDT) (envelope-from phk@freefall.freebsd.org) Received: (from phk@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8KCq3B5061188; Fri, 20 Sep 2002 05:52:03 -0700 (PDT) Message-Id: <200209201252.g8KCq3B5061188@freefall.freebsd.org> From: Poul-Henning Kamp Date: Fri, 20 Sep 2002 05:52:03 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/sys disk.h disklabel.h param.h src/sys/pc98/pc98 diskslice_machdep.c fd.c wd.c src/sys/kern subr_disk.c subr_disklabel.c subr_diskmbr.c src/sys/isa fd.c src/sys/dev/aac aac_disk.c aacvar.h src/sys/dev/amr amrvar.h ... X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG phk 2002/09/20 05:52:03 PDT Modified files: sys/sys disk.h disklabel.h param.h sys/pc98/pc98 diskslice_machdep.c fd.c wd.c sys/kern subr_disk.c subr_disklabel.c subr_diskmbr.c sys/isa fd.c sys/dev/aac aac_disk.c aacvar.h sys/dev/amr amrvar.h sys/dev/ata ata-disk.c sys/dev/mlx mlxvar.h Log: Make FreeBSD "struct disklabel" agnostic, step 311 of 723: Rename diskerr() to disk_err() for naming consistency. Drop the by now entirely useless struct disklabel argument. Add a flag argument for new-line termination. Fix a couple of printf-format-casts to %j instead of %l. Correctly print the name of all bio commands. Move the function from subr_disklabel.c to subr_disk.c, and from to . Use the new disk_err() throughout, #include as needed. Bump __FreeBSD_version for the sake of the aac disk drivers #ifdefs. Remove unused disklabel members of softc for aac, amr and mlx, which seem to originally have been intended for diskerr() use, but which only rotted and got Copy&Pasted at least two times to many. Sponsored by: DARPA & NAI Labs. Revision Changes Path 1.23 +6 -2 src/sys/dev/aac/aac_disk.c 1.21 +0 -1 src/sys/dev/aac/aacvar.h 1.11 +0 -1 src/sys/dev/amr/amrvar.h 1.135 +4 -6 src/sys/dev/ata/ata-disk.c 1.17 +0 -1 src/sys/dev/mlx/mlxvar.h 1.237 +3 -2 src/sys/isa/fd.c 1.57 +40 -3 src/sys/kern/subr_disk.c 1.69 +0 -57 src/sys/kern/subr_disklabel.c 1.56 +5 -6 src/sys/kern/subr_diskmbr.c 1.43 +4 -6 src/sys/pc98/pc98/diskslice_machdep.c 1.122 +2 -2 src/sys/pc98/pc98/fd.c 1.125 +1 -2 src/sys/pc98/pc98/wd.c 1.25 +1 -0 src/sys/sys/disk.h 1.90 +0 -1 src/sys/sys/disklabel.h 1.135 +1 -1 src/sys/sys/param.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message