summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/disksubr.c5
-rw-r--r--sys/arch/amd64/amd64/disksubr.c15
-rw-r--r--sys/arch/arm/arm/disksubr.c15
-rw-r--r--sys/arch/aviion/aviion/disksubr.c15
-rw-r--r--sys/arch/hppa/hppa/disksubr.c5
-rw-r--r--sys/arch/hppa64/hppa64/disksubr.c5
-rw-r--r--sys/arch/i386/i386/disksubr.c5
-rw-r--r--sys/arch/landisk/landisk/disksubr.c15
-rw-r--r--sys/arch/macppc/macppc/disksubr.c9
-rw-r--r--sys/arch/mips64/mips64/disksubr.c5
-rw-r--r--sys/arch/mvme68k/mvme68k/disksubr.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/disksubr.c11
-rw-r--r--sys/arch/sparc/sparc/disksubr.c16
-rw-r--r--sys/arch/vax/vax/disksubr.c14
14 files changed, 75 insertions, 64 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 46cf935b1ec..ad25008c37f 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.61 2006/10/21 14:18:36 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.62 2006/10/21 16:01:53 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -219,6 +219,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
int spoofonly;
{
struct dos_partition dp[NDOSPART], *dp2;
+ struct partition *pp;
unsigned long extoff = 0;
daddr_t part_blkno = DOSBBSECTOR;
char *msg = NULL, *cp;
@@ -300,7 +301,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;
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index 1df1acd07b2..ec839393506 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.22 2006/10/21 14:18:36 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.23 2006/10/21 16:01:53 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -63,12 +63,13 @@ 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 disklabel *dlp;
+ struct partition *pp;
unsigned long extoff = 0;
struct buf *bp = NULL;
daddr_t part_blkno = DOSBBSECTOR;
@@ -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;
@@ -281,12 +282,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 ||
@@ -340,7 +341,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;
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;
diff --git a/sys/arch/aviion/aviion/disksubr.c b/sys/arch/aviion/aviion/disksubr.c
index 90a67b2964e..6e6f74fe9c8 100644
--- a/sys/arch/aviion/aviion/disksubr.c
+++ b/sys/arch/aviion/aviion/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.11 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.12 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;
@@ -279,12 +280,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 ||
@@ -338,7 +339,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;
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index f2eaae125b3..14dd7cdc355 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.41 2006/10/21 14:18:36 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.42 2006/10/21 16:01:53 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -222,6 +222,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
int spoofonly;
{
struct dos_partition dp[NDOSPART], *dp2;
+ struct partition *pp;
unsigned long extoff = 0;
daddr_t part_blkno = DOSBBSECTOR;
char *msg = NULL, *cp;
@@ -303,7 +304,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;
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index 71381bf51a5..3366bdbefd5 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.24 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.25 2006/10/21 16:01:54 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -218,6 +218,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
int spoofonly;
{
struct dos_partition dp[NDOSPART], *dp2;
+ struct partition *pp;
unsigned long extoff = 0;
daddr_t part_blkno = DOSBBSECTOR;
char *msg = NULL, *cp;
@@ -299,7 +300,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;
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 79adde7452a..2d6bf5beab9 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.64 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.65 2006/10/21 16:01:54 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -64,6 +64,7 @@ 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;
struct disklabel *dlp;
unsigned long extoff = 0;
struct buf *bp = NULL;
@@ -155,7 +156,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;
diff --git a/sys/arch/landisk/landisk/disksubr.c b/sys/arch/landisk/landisk/disksubr.c
index bb18872e393..a1667b767b8 100644
--- a/sys/arch/landisk/landisk/disksubr.c
+++ b/sys/arch/landisk/landisk/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.8 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.9 2006/10/21 16:01:54 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;
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index fa144a104bb..2b84644dd97 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.30 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.31 2006/10/21 16:01:54 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -67,6 +67,7 @@ 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;
struct disklabel *dlp;
unsigned long extoff = 0;
struct buf *bp;
@@ -124,7 +125,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
part_cnt = part->pmMapBlkCnt;
n = 0;
for (i = 0; i < part_cnt; i++) {
- struct partition *pp = &lp->d_partitions[8+n];
+ pp = &lp->d_partitions[8+n];
bp->b_blkno = 1+i;
bp->b_bcount = lp->d_secsize;
@@ -181,7 +182,7 @@ hfs_done:
/* do dos partitions in the process of getting disklabel? */
dospartoff = 0;
cyl = LABELSECTOR / lp->d_secpercyl;
- n = 0;
+ n = 0;
/*
* Read dos partition table, follow extended partitions.
@@ -245,7 +246,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;
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 866ec1fc93d..a941842d14d 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.30 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.31 2006/10/21 16:01:54 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -226,6 +226,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
int spoofonly;
{
struct dos_partition dp[NDOSPART], *dp2;
+ struct partition *pp;
unsigned long extoff = 0;
daddr_t part_blkno = DOSBBSECTOR;
char *msg = NULL, *cp;
@@ -307,7 +308,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;
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c
index 3723d086f2a..06c2c003e9f 100644
--- a/sys/arch/mvme68k/mvme68k/disksubr.c
+++ b/sys/arch/mvme68k/mvme68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.36 2006/09/24 22:43:00 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.37 2006/10/21 16:01:54 krw Exp $ */
/*
* Copyright (c) 1998 Steve Murphree, Jr.
* Copyright (c) 1995 Dale Rahn.
@@ -210,7 +210,7 @@ int
writedisklabel(dev, strat, lp, clp)
dev_t dev;
void (*strat)(struct buf *);
- register struct disklabel *lp;
+ struct disklabel *lp;
struct cpu_disklabel *clp;
{
struct buf *bp;
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index 538384f9b8b..cda3da49b56 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.26 2006/10/21 14:18:37 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.27 2006/10/21 16:01:54 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -66,11 +66,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;
@@ -162,7 +163,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;
@@ -281,7 +282,7 @@ done:
*/
int
setdisklabel(olp, nlp, openmask, osdep)
- register struct disklabel *olp, *nlp;
+ struct disklabel *olp, *nlp;
u_long openmask;
struct cpu_disklabel *osdep;
{
@@ -340,7 +341,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;
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index 27180362798..eeb663d25d0 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.41 2006/08/17 10:34:14 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.42 2006/10/21 16:01:54 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
/*
@@ -172,12 +172,12 @@ readdisklabel(dev, strat, lp, clp, spoofonly)
*/
int
setdisklabel(olp, nlp, openmask, clp)
- register struct disklabel *olp, *nlp;
+ struct disklabel *olp, *nlp;
u_long openmask;
struct cpu_disklabel *clp;
{
- 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 ||
@@ -217,7 +217,7 @@ int
writedisklabel(dev, strat, lp, clp)
dev_t dev;
void (*strat)(struct buf *);
- register struct disklabel *lp;
+ struct disklabel *lp;
struct cpu_disklabel *clp;
{
struct buf *bp;
@@ -568,11 +568,11 @@ disklabel_bsd_to_sun(lp, cp)
*/
int
isbad(bt, cyl, trk, sec)
- register struct dkbad *bt;
+ struct dkbad *bt;
int cyl, trk, sec;
{
- register int i;
- register long blk, bblk;
+ int i;
+ long blk, bblk;
blk = ((long)cyl << 16) + (trk << 8) + sec;
for (i = 0; i < NBT_BAD; i++) {
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index 1e0aa5bae34..3e312d60bbb 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.31 2006/10/04 03:23:01 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.32 2006/10/21 16:01:54 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $ */
/*
@@ -117,11 +117,11 @@ 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;
{
- register struct buf *bp;
+ struct buf *bp;
struct disklabel *dlp;
char *msg = NULL;
int i;
@@ -189,12 +189,12 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
*/
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 ||
@@ -245,7 +245,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 buf *bp;