AllCommands: simplify the tokenizer loop

1 files changed, 19 insertions, 17 deletions

diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index f740373de..b2d9f52d3 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -384,23 +384,25 @@ command_process(Client &client, unsigned num, char *line)
 
 	/* now parse the arguments (quoted or unquoted) */
 
-	while (argc < COMMAND_ARGV_MAX &&
-	       (argv[argc] =
-		tokenizer.NextParam(error)) != nullptr)
-		++argc;
-
-	/* some error checks */
-
-	if (argc >= COMMAND_ARGV_MAX) {
-		command_error(client, ACK_ERROR_ARG, "Too many arguments");
-		current_command = nullptr;
-		return CommandResult::ERROR;
-	}
-
-	if (!tokenizer.IsEnd()) {
-		command_error(client, ACK_ERROR_ARG, "%s", error.GetMessage());
-		current_command = nullptr;
-		return CommandResult::ERROR;
+	while (true) {
+		if (argc == COMMAND_ARGV_MAX) {
+			command_error(client, ACK_ERROR_ARG,
+				      "Too many arguments");
+			current_command = nullptr;
+			return CommandResult::ERROR;
+		}
+
+		char *a = tokenizer.NextParam(error);
+		if (a == nullptr) {
+			if (tokenizer.IsEnd())
+				break;
+
+			command_error(client, ACK_ERROR_ARG, "%s", error.GetMessage());
+			current_command = nullptr;
+			return CommandResult::ERROR;
+		}
+
+		argv[argc++] = a;
 	}
 
 	/* look up and invoke the command handler */