From f094884c1b76f2dccb3f05817d3fba038c9d98e1 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Sat, 2 Sep 2023 20:18:42 +0800 Subject: [PATCH] Remove redundant nil checks in system connection remove From the Go specification: "3. If the map is nil, the number of iterations is 0." [1] Therefore, an additional nil check for before the loop is unnecessary. [NO NEW TESTS NEEDED] [1]: https://go.dev/ref/spec#For_range Signed-off-by: Eng Zer Jun --- cmd/podman/system/connection/remove.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index dbe4192fa797..72b24c10a85b 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -54,18 +54,14 @@ func rm(cmd *cobra.Command, args []string) error { } if rmOpts.All { - if cfg.Engine.ServiceDestinations != nil { - for k := range cfg.Engine.ServiceDestinations { - delete(cfg.Engine.ServiceDestinations, k) - } + for k := range cfg.Engine.ServiceDestinations { + delete(cfg.Engine.ServiceDestinations, k) } cfg.Engine.ActiveService = "" // Clear all the connections in any existing farms - if cfg.Farms.List != nil { - for k := range cfg.Farms.List { - cfg.Farms.List[k] = []string{} - } + for k := range cfg.Farms.List { + cfg.Farms.List[k] = []string{} } return cfg.Write() } @@ -83,12 +79,10 @@ func rm(cmd *cobra.Command, args []string) error { } // If there are existing farm, remove the deleted connection that might be part of a farm - if cfg.Farms.List != nil { - for k, v := range cfg.Farms.List { - index := util.IndexOfStringInSlice(args[0], v) - if index > -1 { - cfg.Farms.List[k] = append(v[:index], v[index+1:]...) - } + for k, v := range cfg.Farms.List { + index := util.IndexOfStringInSlice(args[0], v) + if index > -1 { + cfg.Farms.List[k] = append(v[:index], v[index+1:]...) } }