From eed50d403cf7f98f34f22343fb4a355eecae1a9b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 5 Feb 2021 15:45:52 +0100 Subject: [PATCH] virfirewalltest: Shuffle the code around to remove a loop 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 Reviewed-by: Michal Privoznik --- tests/virfirewalltest.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 9f95520859..e14a34d7d2 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -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); } }