[RFC PATCH 3/9] tests: qemumonitor: Optimize control flow when concatenating replies

[Peter Krempa <pkrempa@xxxxxxxxxx>]

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 <pkrempa@xxxxxxxxxx>
---
 tests/qemumonitortestutils.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index a73272e7b0..98c6ce6187 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1422,30 +1422,32 @@ qemuMonitorTestNewFromFileFull(const char *fileName,
         if (!tmp[1])
             break;

+        /* concatenate block which was broken up for readability */
         if (*(tmp + 1) != '\n') {
             *tmp = ' ';
             tmp++;
+            continue;
+        }
+
+        /* Cut off a single reply. */
+        *(tmp + 1) = '\0';
+
+        if (response) {
+            if (qemuMonitorTestFullAddItem(ret, fileName, command,
+                                           response, commandln) < 0)
+                goto error;
+            command = NULL;
+            response = NULL;
+        }
+
+        /* Move the @tmp and @singleReply. */
+        tmp += 2;
+
+        if (!command) {
+            commandln = line;
+            command = tmp;
         } else {
-            /* Cut off a single reply. */
-            *(tmp + 1) = '\0';
-
-            if (response) {
-                if (qemuMonitorTestFullAddItem(ret, fileName, command,
-                                               response, commandln) < 0)
-                    goto error;
-                command = NULL;
-                response = NULL;
-            }
-
-            /* Move the @tmp and @singleReply. */
-            tmp += 2;
-
-            if (!command) {
-                commandln = line;
-                command = tmp;
-            } else {
-                response = tmp;
-            }
+            response = tmp;
         }
     }

-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list