summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-10-21 14:18:38 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-10-21 14:18:38 +0000
commit1d6526c6f4de3600111b9ba4b1194566a9d69b5d (patch)
treed1086d10c728ab2ac899ac3b143d7cbf31b2a1d4
parent143a083cb6d8f0033248cf779ef1d49c4fdcdaae (diff)
We have a pointer (pp), so use it in the DOSPTYP_UNUSED case rather
than lp->d_partitions[8+n++]. All other cases already use the pointer. No functional change.
-rw-r--r--sys/arch/alpha/alpha/disksubr.c6
-rw-r--r--sys/arch/amd64/amd64/disksubr.c6
-rw-r--r--sys/arch/arm/arm/disksubr.c6
-rw-r--r--sys/arch/aviion/aviion/disksubr.c6
-rw-r--r--sys/arch/hppa/hppa/disksubr.c6
-rw-r--r--sys/arch/hppa64/hppa64/disksubr.c6
-rw-r--r--sys/arch/i386/i386/disksubr.c6
-rw-r--r--sys/arch/landisk/landisk/disksubr.c6
-rw-r--r--sys/arch/macppc/macppc/disksubr.c6
-rw-r--r--sys/arch/mips64/mips64/disksubr.c6
-rw-r--r--sys/arch/mvmeppc/mvmeppc/disksubr.c6
11 files changed, 33 insertions, 33 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 342b5e8497d..46cf935b1ec 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.60 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.61 2006/10/21 14:18:36 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -325,8 +325,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index b9301c73803..1df1acd07b2 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.21 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.22 2006/10/21 14:18:36 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -184,8 +184,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 7f1d1c4282f..b4e79e369c6 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.19 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.20 2006/10/21 14:18:36 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -184,8 +184,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/aviion/aviion/disksubr.c b/sys/arch/aviion/aviion/disksubr.c
index fe2a511623f..90a67b2964e 100644
--- a/sys/arch/aviion/aviion/disksubr.c
+++ b/sys/arch/aviion/aviion/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.10 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.11 2006/10/21 14:18:37 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -184,8 +184,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 25ce748130d..f2eaae125b3 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.40 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.41 2006/10/21 14:18:36 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -328,8 +328,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index 552037a585d..71381bf51a5 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.23 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.24 2006/10/21 14:18:37 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -324,8 +324,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 0cf29aaeefe..79adde7452a 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.63 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.64 2006/10/21 14:18:37 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -180,8 +180,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/landisk/landisk/disksubr.c b/sys/arch/landisk/landisk/disksubr.c
index be4bdb5df61..bb18872e393 100644
--- a/sys/arch/landisk/landisk/disksubr.c
+++ b/sys/arch/landisk/landisk/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.7 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.8 2006/10/21 14:18:37 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -184,8 +184,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index c7c7ddb83f3..fa144a104bb 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.29 2006/10/20 23:47:42 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.30 2006/10/21 14:18:37 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -270,8 +270,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index fadbdce32df..866ec1fc93d 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.29 2006/10/20 23:47:43 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.30 2006/10/21 14:18:37 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -332,8 +332,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX:
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index e8bc10cca22..538384f9b8b 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.25 2006/10/20 23:47:43 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.26 2006/10/21 14:18:37 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -187,8 +187,8 @@ donot:
*/
if (cp == (char *)(dp2 + 1))
continue;
- lp->d_partitions[8 + n++].p_fstype =
- FS_UNUSED;
+ pp->p_fstype = FS_UNUSED;
+ n++;
break;
case DOSPTYP_LINUX: