diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-05-31 19:57:45 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-05-31 19:57:45 +0000 |
| commit | f0646dd190203a23d2994fe048d94b73b2b4240f (patch) | |
| tree | b761d67865eedb832715a59a431435310e458a27 /sys/arch/hppa64 | |
| parent | 4ce4767776c759f2905628af590a0b41814b6647 (diff) | |
KNF, whitespace and comment rectification to make all
bounds_check_with_label() routines as identical as possible without
changing any code. Code nits and adjustments to come.
Diffstat (limited to 'sys/arch/hppa64')
| -rw-r--r-- | sys/arch/hppa64/hppa64/disksubr.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c index 55c1190e3d2..e795309981d 100644 --- a/sys/arch/hppa64/hppa64/disksubr.c +++ b/sys/arch/hppa64/hppa64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.33 2007/05/31 16:05:50 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.34 2007/05/31 19:57:43 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -685,16 +685,13 @@ writedisklabel(dev, strat, lp, osdep) * if needed, and signal errors or early completion. */ int -bounds_check_with_label(bp, lp, osdep, wlabel) - struct buf *bp; - struct disklabel *lp; - struct cpu_disklabel *osdep; - int wlabel; +bounds_check_with_label(struct buf *bp, struct disklabel *lp, + struct cpu_disklabel *osdep, int wlabel) { #define blockpersec(count, lp) ((count) * (((lp)->d_secsize) / DEV_BSIZE)) struct partition *p = lp->d_partitions + DISKPART(bp->b_dev); - int labelsector = blockpersec(lp->d_partitions[RAW_PART].p_offset, - lp) + osdep->labelsector; + int labelsector = blockpersec(lp->d_partitions[RAW_PART].p_offset, lp) + + osdep->labelsector; int sz = howmany(bp->b_bcount, DEV_BSIZE); /* avoid division by zero */ |