[PATCH 16/25] squash into 'network: convert local pointers to g_auto*'

Laine Stump laine at redhat.com
Thu Jun 25 03:38:50 UTC 2020


OOPS!!

I meant to squash this into patch 10 before posting. If you want to just 
review it separately I can squash it in before push. Or if you want to 
be pedantic I can squash it in and resend :-)

On 6/24/20 11:34 PM, Laine Stump wrote:
> Signed-off-by: Laine Stump <laine at redhat.com>
> ---
>   src/network/bridge_driver_linux.c | 9 ++-------
>   1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
> index 0d0ac730f2..7f765bcf99 100644
> --- a/src/network/bridge_driver_linux.c
> +++ b/src/network/bridge_driver_linux.c
> @@ -834,7 +834,7 @@ int networkAddFirewallRules(virNetworkDefPtr def)
>   {
>       size_t i;
>       virNetworkIPDefPtr ipdef;
> -    g_autoptr(virFirewall) fw = NULL;
> +    g_autoptr(virFirewall) fw = virFirewallNew();
>   
>       if (virOnce(&createdOnce, networkSetupPrivateChains) < 0)
>           return -1;
> @@ -920,8 +920,6 @@ int networkAddFirewallRules(virNetworkDefPtr def)
>           }
>       }
>   
> -    fw = virFirewallNew();
> -
>       virFirewallStartTransaction(fw, 0);
>   
>       networkAddGeneralFirewallRules(fw, def);
> @@ -946,10 +944,7 @@ int networkAddFirewallRules(virNetworkDefPtr def)
>       virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS);
>       networkAddChecksumFirewallRules(fw, def);
>   
> -    if (virFirewallApply(fw) < 0)
> -        return -1;
> -
> -    return 0;
> +    return virFirewallApply(fw);
>   }
>   
>   /* Remove all rules for all ip addresses (and general rules) on a network */





More information about the libvir-list mailing list