External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemumonitor: Simplify handling of end of file in full file test

Browse Source 
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>
This commit is contained in:
Peter Krempa 2018-05-03 11:38:23 +02:00
parent 215167042a
commit dcea889b13
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/qemumonitortestutils.c
View File

@ -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) {