From: Daniel P. Berrangé <berrange@redhat.com> The vircommand.c code will always log the argv about to be run, so logging it again in virfirewall.c is redundant. Removing the dupe avoids the repeated memory allocation from the array -> string conversion. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/util/virfirewall.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 69521e2b46..a64f8b69c7 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -571,7 +571,6 @@ virFirewallCmdIptablesApply(virFirewall *firewall, VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK); bool needRollback = false; g_autoptr(virCommand) cmd = NULL; - g_autofree char *cmdStr = NULL; g_autofree char *error = NULL; size_t i; int status; @@ -607,9 +606,6 @@ virFirewallCmdIptablesApply(virFirewall *firewall, virCommandAddArg(cmd, fwCmd->args[i]); } - cmdStr = virCommandToString(cmd, false); - VIR_INFO("Running firewall command '%s'", NULLSTR(cmdStr)); - virCommandSetOutputBuffer(cmd, output); virCommandSetErrorBuffer(cmd, &error); @@ -622,6 +618,7 @@ virFirewallCmdIptablesApply(virFirewall *firewall, VIR_DEBUG("Ignoring error running command"); return 0; } else { + g_autofree char *cmdStr = virCommandToString(cmd, false); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to run firewall command %1$s: %2$s"), NULLSTR(cmdStr), NULLSTR(error)); @@ -671,7 +668,6 @@ virFirewallCmdNftablesApply(virFirewall *firewall G_GNUC_UNUSED, size_t cmdIdx = 0; const char *objectType = NULL; g_autoptr(virCommand) cmd = NULL; - g_autofree char *cmdStr = NULL; g_autofree char *error = NULL; size_t i; int status; @@ -727,9 +723,6 @@ virFirewallCmdNftablesApply(virFirewall *firewall G_GNUC_UNUSED, for (i = 0; i < fwCmd->argsLen; i++) virCommandAddArg(cmd, fwCmd->args[i]); - cmdStr = virCommandToString(cmd, false); - VIR_INFO("Applying '%s'", NULLSTR(cmdStr)); - virCommandSetOutputBuffer(cmd, output); virCommandSetErrorBuffer(cmd, &error); @@ -745,6 +738,7 @@ virFirewallCmdNftablesApply(virFirewall *firewall G_GNUC_UNUSED, } else if (fwCmd->ignoreErrors) { VIR_DEBUG("Ignoring error running command"); } else { + g_autofree char *cmdStr = virCommandToString(cmd, false); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to apply firewall command '%1$s': %2$s"), NULLSTR(cmdStr), NULLSTR(error)); @@ -776,6 +770,7 @@ virFirewallCmdNftablesApply(virFirewall *firewall G_GNUC_UNUSED, } if (!handleLen) { + g_autofree char *cmdStr = virCommandToString(cmd, false); virReportError(VIR_ERR_INTERNAL_ERROR, _("couldn't register rollback command - command '%1$s' had no valid handle in output ('%2$s')"), NULLSTR(cmdStr), NULLSTR(*output)); -- 2.53.0