summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-10-21 16:01:55 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-10-21 16:01:55 +0000
commitd0e8f636ee6a51ad73fd6c2617eeaf1aae162618 (patch)
tree0d8520fd3e4d96585ff6ff465b38eceb65cbbec2 /sys/arch/arm
parentc6ced3de0f5d243baf070114323bc236ff5fbdd8 (diff)
Some KNF cleanup.
De-register. Move declaration to top of function for DOS MBR processing. Indent nit in macppc. No functional change.
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/arm/disksubr.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index b4e79e369c6..7e3ffe505a3 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.20 2006/10/21 14:18:36 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.21 2006/10/21 16:01:53 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -63,11 +63,12 @@ char *
readdisklabel(dev, strat, lp, osdep, spoofonly)
dev_t dev;
void (*strat)(struct buf *);
- register struct disklabel *lp;
+ struct disklabel *lp;
struct cpu_disklabel *osdep;
int spoofonly;
{
struct dos_partition dp[NDOSPART], *dp2;
+ struct partition *pp;
struct disklabel *dlp;
unsigned long extoff = 0;
struct buf *bp = NULL;
@@ -159,7 +160,7 @@ donot:
* provide a fake label in i-p.
*/
for (dp2=dp, i=0; i < NDOSPART && n < 8; i++, dp2++) {
- struct partition *pp = &lp->d_partitions[8+n];
+ pp = &lp->d_partitions[8+n];
if (dp2->dp_typ == DOSPTYP_OPENBSD)
continue;
@@ -280,12 +281,12 @@ done:
*/
int
setdisklabel(olp, nlp, openmask, osdep)
- register struct disklabel *olp, *nlp;
+ struct disklabel *olp, *nlp;
u_long openmask;
struct cpu_disklabel *osdep;
{
- register int i;
- register struct partition *opp, *npp;
+ int i;
+ struct partition *opp, *npp;
/* sanity clause */
if (nlp->d_secpercyl == 0 || nlp->d_secsize == 0 ||
@@ -339,7 +340,7 @@ int
writedisklabel(dev, strat, lp, osdep)
dev_t dev;
void (*strat)(struct buf *);
- register struct disklabel *lp;
+ struct disklabel *lp;
struct cpu_disklabel *osdep;
{
struct dos_partition dp[NDOSPART], *dp2;