diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 16:42:08 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 16:42:08 +0000 |
| commit | d11216cf36578f6f06482da63b45f1cf02b7ec1d (patch) | |
| tree | 008bf85dd65940c398ccaedb1376261a1e08d850 /sys/arch/i386 | |
| parent | 32d210caa068e883bc0c0c7804fd07bc1fefdcad (diff) | |
a fair sprinking of knf, code movement, and sometimes character-by-character
accuracy so that the variious disksubr.c's can be compared easier.
setdisklabel() starts taking an int for openmask.
ok krw, and read by quite a few other people
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/disksubr.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c index e233087352a..ef955d27a98 100644 --- a/sys/arch/i386/i386/disksubr.c +++ b/sys/arch/i386/i386/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.77 2007/06/05 00:38:15 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.78 2007/06/06 16:42:06 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -66,8 +66,8 @@ bios_diskinfo_t *bios_getdiskinfo(dev_t dev); char * -readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, - struct cpu_disklabel *osdep, int spoofonly) +readdisklabel(dev_t dev, void (*strat)(struct buf *), + struct disklabel *lp, struct cpu_disklabel *osdep, int spoofonly) { struct dos_partition dp[NDOSPART], *dp2; struct partition *pp; @@ -216,9 +216,9 @@ donot: case DOSPTYP_FAT12: case DOSPTYP_FAT16S: case DOSPTYP_FAT16B: - case DOSPTYP_FAT32: case DOSPTYP_FAT32L: case DOSPTYP_FAT16L: + case DOSPTYP_FAT32: pp->p_fstype = FS_MSDOS; n++; break; @@ -325,8 +325,8 @@ done: * before setting it. */ int -setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, - struct cpu_disklabel *osdep) +setdisklabel(struct disklabel *olp, struct disklabel *nlp, + u_int openmask, struct cpu_disklabel *osdep) { int i; struct partition *opp, *npp; @@ -380,8 +380,8 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_long openmask, * XXX cannot handle OpenBSD partitions in extended partitions! */ int -writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, - struct cpu_disklabel *osdep) +writedisklabel(dev_t dev, void (*strat)(struct buf *), + struct disklabel *lp, struct cpu_disklabel *osdep) { struct dos_partition dp[NDOSPART], *dp2; struct disklabel *dlp; |