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@xxxxxxxxxx>
---
tests/qemumonitortestutils.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 62f68ee699..a73272e7b0 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1416,9 +1416,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++;
@@ -1434,21 +1437,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) {
--
2.16.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
