Oops, unbreak parsing of the `type' field in getasciilabel(). I had
changed a `goto' to a `continue' in revision 1.52, but it continued the wrong loop. Noticed by: bde
This commit is contained in:
parent
fc511333b6
commit
09dbd0701c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=97855
@ -958,8 +958,10 @@ getasciilabel(FILE *f, struct disklabel *lp)
|
|||||||
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
|
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
|
||||||
if (*cpp && streq(*cpp, tp)) {
|
if (*cpp && streq(*cpp, tp)) {
|
||||||
lp->d_type = cpp - dktypenames;
|
lp->d_type = cpp - dktypenames;
|
||||||
continue;
|
break;
|
||||||
}
|
}
|
||||||
|
if (cpp < &dktypenames[DKMAXTYPES])
|
||||||
|
continue;
|
||||||
v = atoi(tp);
|
v = atoi(tp);
|
||||||
if ((unsigned)v >= DKMAXTYPES)
|
if ((unsigned)v >= DKMAXTYPES)
|
||||||
fprintf(stderr, "line %d:%s %d\n", lineno,
|
fprintf(stderr, "line %d:%s %d\n", lineno,
|
||||||
|
@ -958,8 +958,10 @@ getasciilabel(FILE *f, struct disklabel *lp)
|
|||||||
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
|
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
|
||||||
if (*cpp && streq(*cpp, tp)) {
|
if (*cpp && streq(*cpp, tp)) {
|
||||||
lp->d_type = cpp - dktypenames;
|
lp->d_type = cpp - dktypenames;
|
||||||
continue;
|
break;
|
||||||
}
|
}
|
||||||
|
if (cpp < &dktypenames[DKMAXTYPES])
|
||||||
|
continue;
|
||||||
v = atoi(tp);
|
v = atoi(tp);
|
||||||
if ((unsigned)v >= DKMAXTYPES)
|
if ((unsigned)v >= DKMAXTYPES)
|
||||||
fprintf(stderr, "line %d:%s %d\n", lineno,
|
fprintf(stderr, "line %d:%s %d\n", lineno,
|
||||||
|
Loading…
Reference in New Issue
Block a user