aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey V. Elsukov <ae@FreeBSD.org>2011-11-06 19:03:07 +0000
committerAndrey V. Elsukov <ae@FreeBSD.org>2011-11-06 19:03:07 +0000
commitb11075cdeb662e3d9b9ead5064a55566746d09b9 (patch)
tree95ea34a506c0b1f6b1d2b6720d34dcab3e232132
parent3a01367a9bba0f093a45434a610f27630a04cda9 (diff)
downloadsrc-b11075cdeb662e3d9b9ead5064a55566746d09b9.tar.gz
src-b11075cdeb662e3d9b9ead5064a55566746d09b9.zip
Remove unneeded checks.
MFC after: 1 week
Notes
Notes: svn path=/head/; revision=227262
-rw-r--r--sbin/bsdlabel/bsdlabel.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 4f5a2c6a3fcd..50f576969fdc 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -831,7 +831,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
continue;
}
if (sscanf(cp, "%lu partitions", &v) == 1) {
- if (v == 0 || v > MAXPARTITIONS) {
+ if (v > MAXPARTITIONS) {
fprintf(stderr,
"line %d: bad # of partitions\n", lineno);
lp->d_npartitions = MAXPARTITIONS;
@@ -1186,8 +1186,7 @@ checklabel(struct disklabel *lp)
lp->d_secperunit = vl->d_secperunit;
if (lp->d_bbsize == 0)
lp->d_bbsize = vl->d_bbsize;
- if (lp->d_npartitions == 0 ||
- lp->d_npartitions < DEFPARTITIONS ||
+ if (lp->d_npartitions < DEFPARTITIONS ||
lp->d_npartitions > MAXPARTITIONS)
lp->d_npartitions = vl->d_npartitions;
}