From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 10 Jan 2017 15:12:56 +0000 (-0500)
Subject: use do/while instead of goto
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=678cf527caa77b7cac2810723e866c54302bbbd6;p=thirdparty%2Ffreeradius-server.git

use do/while instead of goto
---

diff --git a/src/util/worker.c b/src/util/worker.c
index 990d8b482ff..03ae3e71e62 100644
--- a/src/util/worker.c
+++ b/src/util/worker.c
@@ -621,24 +621,25 @@ static REQUEST *fr_worker_get_request(fr_worker_t *worker, fr_time_t now)
 	 *	Find either a localized message, or one which is in
 	 *	the "to_decode" queue.
 	 */
-redo:
-	WORKER_HEAP_POP(localized, cd, request.list);
-	if (!cd) {
-		WORKER_HEAP_POP(to_decode, cd, request.list);
-	}
-	if (!cd) return NULL;
+	do {
+		WORKER_HEAP_POP(localized, cd, request.list);
+		if (!cd) {
+			WORKER_HEAP_POP(to_decode, cd, request.list);
+		}
+		if (!cd) return NULL;
 
-	worker->num_decoded++;
+		worker->num_decoded++;
 
-	/*
-	 *	This message has asynchronously aged out while it was
-	 *	in the queue.  Delete it, and go get another one.
-	 */
-	if (cd->request.start_time && (cd->m.when != *cd->request.start_time)) {
-		MPRINT("\tIGNORING old message\n");
-		fr_worker_nak(worker, cd, fr_time());
-		goto redo;
-	}
+		/*
+		 *	This message has asynchronously aged out while it was
+		 *	in the queue.  Delete it, and go get another one.
+		 */
+		if (cd->request.start_time && (cd->m.when != *cd->request.start_time)) {
+			MPRINT("\tIGNORING old message\n");
+			fr_worker_nak(worker, cd, fr_time());
+			cd = NULL;
+		}
+	} while (!cd);
 
 #ifndef HAVE_TALLOC_POOLED_OBJECT
 	/*