From 1025264ec59827a2fd581eb72367c51c109aec2d Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 3 May 2018 11:43:34 +0200 Subject: [PATCH] tests: qemumonitor: Optimize control flow when concatenating replies The test file can be broken up by newlines and is automatically concatenated back. Fix the control flow so that the concatenation code 'continues' the loop rather than branching out. Also add an anotation to the concatenation code. Signed-off-by: Peter Krempa Reviewed-by: John Ferlan --- tests/qemumonitortestutils.c | 38 +++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 4bfe629909..d857c381a4 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1423,30 +1423,32 @@ qemuMonitorTestNewFromFileFull(const char *fileName, if (!tmp[1]) break; + /* concatenate block which was broken up for readability */ if (*(tmp + 1) != '\n') { *tmp = ' '; tmp++; - } else { - /* Cut off a single reply. */ - *(tmp + 1) = '\0'; + continue; + } - if (response) { - if (qemuMonitorTestFullAddItem(ret, fileName, command, - response, commandln) < 0) - goto error; - command = NULL; - response = NULL; - } + /* Cut off a single reply. */ + *(tmp + 1) = '\0'; - /* Move the @tmp and @singleReply. */ - tmp += 2; + if (response) { + if (qemuMonitorTestFullAddItem(ret, fileName, command, + response, commandln) < 0) + goto error; + command = NULL; + response = NULL; + } - if (!command) { - commandln = line; - command = tmp; - } else { - response = tmp; - } + /* Move the @tmp and @singleReply. */ + tmp += 2; + + if (!command) { + commandln = line; + command = tmp; + } else { + response = tmp; } } -- 2.47.2