From dcea889b134e01f41e692ab0886efc0af0647835 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 3 May 2018 11:38:23 +0200
Subject: [PATCH] tests: qemumonitor: Simplify handling of end of file in full
 file test

On EOF, the loop can be terminated right away since most of it is
skipped anyways and the handling of the last command is repeated after
the loop.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 tests/qemumonitortestutils.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 789eb72196..4bfe629909 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1417,9 +1417,12 @@ qemuMonitorTestNewFromFileFull(const char *fileName,
     tmp = jsonstr;
     command = tmp;
     while ((tmp = strchr(tmp, '\n'))) {
-        bool eof = !tmp[1];
         line++;
 
+        /* eof */
+        if (!tmp[1])
+            break;
+
         if (*(tmp + 1) != '\n') {
             *tmp = ' ';
             tmp++;
@@ -1435,21 +1438,16 @@ qemuMonitorTestNewFromFileFull(const char *fileName,
                 response = NULL;
             }
 
-            if (!eof) {
-                /* Move the @tmp and @singleReply. */
-                tmp += 2;
+            /* Move the @tmp and @singleReply. */
+            tmp += 2;
 
-                if (!command) {
-                    commandln = line;
-                    command = tmp;
-                } else {
-                    response = tmp;
-                }
+            if (!command) {
+                commandln = line;
+                command = tmp;
+            } else {
+                response = tmp;
             }
         }
-
-        if (eof)
-            break;
     }
 
     if (command) {