Assemble: turn next_member goto loop into a for loop.
It becomes much clearer what is happening now. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
02c2c47487
commit
88cef9b3e6
40
Assemble.c
40
Assemble.c
|
@ -406,29 +406,27 @@ int Assemble(struct supertype *st, char *mddev,
|
||||||
fprintf(stderr, Name ": looking in container %s\n",
|
fprintf(stderr, Name ": looking in container %s\n",
|
||||||
devname);
|
devname);
|
||||||
|
|
||||||
content = tst->ss->container_content(tst, NULL);
|
for (content = tst->ss->container_content(tst, NULL);
|
||||||
next_member:
|
content;
|
||||||
|
content = content->next) {
|
||||||
|
|
||||||
if (!content)
|
if (!ident_matches(ident, content, tst,
|
||||||
goto loop; /* empty container */
|
homehost, update,
|
||||||
|
report_missmatch ? devname : NULL))
|
||||||
if (content->next == NULL)
|
/* message already printed */;
|
||||||
tmpdev->used = 2;
|
else if (is_member_busy(content->text_version)) {
|
||||||
|
if (report_missmatch)
|
||||||
if (!ident_matches(ident, content, tst,
|
fprintf(stderr, Name ": member %s in %s is already assembled\n",
|
||||||
homehost, update,
|
content->text_version,
|
||||||
report_missmatch ? devname : NULL)) {
|
devname);
|
||||||
content = content->next;
|
} else
|
||||||
goto next_member;
|
break;
|
||||||
} else if (is_member_busy(content->text_version)) {
|
|
||||||
if (report_missmatch)
|
|
||||||
fprintf(stderr, Name ": member %s in %s is already assembled\n",
|
|
||||||
content->text_version,
|
|
||||||
devname);
|
|
||||||
|
|
||||||
content = content->next;
|
|
||||||
goto next_member;
|
|
||||||
}
|
}
|
||||||
|
if (!content) {
|
||||||
|
tmpdev->used = 2;
|
||||||
|
goto loop; /* empty container */
|
||||||
|
}
|
||||||
|
|
||||||
st = tst; tst = NULL;
|
st = tst; tst = NULL;
|
||||||
if (!auto_assem && inargv && tmpdev->next != NULL) {
|
if (!auto_assem && inargv && tmpdev->next != NULL) {
|
||||||
fprintf(stderr, Name ": %s is a container, but is not "
|
fprintf(stderr, Name ": %s is a container, but is not "
|
||||||
|
|
Loading…
Reference in New Issue