External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virfirewalltest: Shuffle the code around to remove a loop

Browse Source 
We are already looping over the arguments to construct the list, so we
can add them to fwBuf right away rather than in an extra loop if we move
some of the 'fwBuf' parts earlier and merge the two loops.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-05 15:45:52 +01:00
parent 4a33825314
commit eed50d403c
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/virfirewalltest.c
View File

@ -108,23 +108,11 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync,
char *item = NULL;
bool isAdd = false;
bool doError = false;
size_t i;
g_variant_get(params, "(&sas)", &type, &iter);
nargs = g_variant_iter_n_children(iter);
while (g_variant_iter_loop(iter, "s", &item)) {
/* Fake failure on the command with this IP addr */
if (STREQ(item, "-A")) {
isAdd = true;
} else if (isAdd && STREQ(item, "192.168.122.255")) {
doError = true;
}
virStringListAdd(&args, item);
}
if (fwBuf) {
if (STREQ(type, "ipv4"))
virBufferAddLit(fwBuf, IPTABLES_PATH);
@ -134,10 +122,19 @@ VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync,
virBufferAddLit(fwBuf, EBTABLES_PATH);
}
for (i = 0; i < nargs; i++) {
while (g_variant_iter_loop(iter, "s", &item)) {
/* Fake failure on the command with this IP addr */
if (STREQ(item, "-A")) {
isAdd = true;
} else if (isAdd && STREQ(item, "192.168.122.255")) {
doError = true;
}
virStringListAdd(&args, item);
if (fwBuf) {
virBufferAddLit(fwBuf, " ");
virBufferEscapeShell(fwBuf, args[i]);
virBufferEscapeShell(fwBuf, item);
}
}