From 09213601336e1292ca0571cf4d906f3475f27bb5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 5 Jul 2023 23:07:04 +0200 Subject: [PATCH] libnetwork/iptables: checkRunning(): use early return Remove redundant variable declarations, and use an early return instead. Signed-off-by: Sebastiaan van Stijn --- libnetwork/iptables/firewalld.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libnetwork/iptables/firewalld.go b/libnetwork/iptables/firewalld.go index b632454ad6..f08961cf3d 100644 --- a/libnetwork/iptables/firewalld.go +++ b/libnetwork/iptables/firewalld.go @@ -177,14 +177,12 @@ func OnReloaded(callback func()) { // Call some remote method to see whether the service is actually running. func checkRunning() bool { - var zone string - var err error - - if connection != nil { - err = connection.sysObj.Call(dbusInterface+".getDefaultZone", 0).Store(&zone) - return err == nil + if connection == nil { + return false } - return false + var zone string + err := connection.sysObj.Call(dbusInterface+".getDefaultZone", 0).Store(&zone) + return err == nil } // Passthrough method simply passes args through to iptables/ip6tables