From: krw <krw@openbsd.org>
Date: Thu, 8 Oct 2015 12:54:30 +0000 (+0000)
Subject: Simpify some code by noting that DOSBBSECTOR is 0, so "if (n >
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bbb248d5d9f75c6232469c586fd29fa96dae4c57;p=openbsd

Simpify some code by noting that DOSBBSECTOR is 0, so "if (n >
n+DOSBBSSECTOR) ..." is pointless, as is "n = n + DOSBBSECTOR;".
---

diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid.c
index bf46d86b85e..336865ae885 100644
--- a/sys/arch/amd64/stand/libsa/softraid.c
+++ b/sys/arch/amd64/stand/libsa/softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.13 2015/10/01 20:28:12 krw Exp $	*/
+/*	$OpenBSD: softraid.c,v 1.14 2015/10/08 12:54:30 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -413,11 +413,8 @@ sr_getdisklabel(struct sr_boot_volume *bv, struct disklabel *label)
 			dp = &mbr.dmbr_parts[i];
 			if (!dp->dp_size)
 				continue;
-			if (dp->dp_typ == DOSPTYP_OPENBSD) {
-				if (dp->dp_start > (dp->dp_start + DOSBBSECTOR))
-					continue;
-				start = dp->dp_start + DOSBBSECTOR;
-			}
+			if (dp->dp_typ == DOSPTYP_OPENBSD)
+				start = dp->dp_start;
 		}
 	}
 
diff --git a/sys/arch/i386/stand/libsa/softraid.c b/sys/arch/i386/stand/libsa/softraid.c
index bf46d86b85e..336865ae885 100644
--- a/sys/arch/i386/stand/libsa/softraid.c
+++ b/sys/arch/i386/stand/libsa/softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.13 2015/10/01 20:28:12 krw Exp $	*/
+/*	$OpenBSD: softraid.c,v 1.14 2015/10/08 12:54:30 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -413,11 +413,8 @@ sr_getdisklabel(struct sr_boot_volume *bv, struct disklabel *label)
 			dp = &mbr.dmbr_parts[i];
 			if (!dp->dp_size)
 				continue;
-			if (dp->dp_typ == DOSPTYP_OPENBSD) {
-				if (dp->dp_start > (dp->dp_start + DOSBBSECTOR))
-					continue;
-				start = dp->dp_start + DOSBBSECTOR;
-			}
+			if (dp->dp_typ == DOSPTYP_OPENBSD)
+				start = dp->dp_start;
 		}
 	}