From 88cef9b3e634987b1689b61c643552e2cdecdbf9 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 22 Nov 2010 20:58:06 +1100
Subject: [PATCH] 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>
---
 Assemble.c | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/Assemble.c b/Assemble.c
index 771cb77..dbf78f9 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -406,29 +406,27 @@ int Assemble(struct supertype *st, char *mddev,
 				fprintf(stderr, Name ": looking in container %s\n",
 					devname);
 
-			content = tst->ss->container_content(tst, NULL);
-		next_member:
+			for (content = tst->ss->container_content(tst, NULL);
+			     content;
+			     content = content->next) {
 
-			if (!content)
-				goto loop; /* empty container */
-
-			if (content->next == NULL)
-				tmpdev->used = 2;
-
-			if (!ident_matches(ident, content, tst,
-					   homehost, update,
-					   report_missmatch ? devname : NULL)) {
-				content = content->next;
-				goto next_member;
-			} 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 (!ident_matches(ident, content, tst,
+						   homehost, update,
+						   report_missmatch ? devname : NULL))
+					/* message already printed */;
+				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);
+				} else
+					break;
 			}
+			if (!content) {
+				tmpdev->used = 2;
+				goto loop; /* empty container */
+			}
+
 			st = tst; tst = NULL;
 			if (!auto_assem && inargv && tmpdev->next != NULL) {
 				fprintf(stderr, Name ": %s is a container, but is not "