diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-12 13:15:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 13:15:35 -0500 |
| commit | db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd (patch) | |
| tree | a1afbf91732f4b20b2cbacb460a3b7b60d6b6919 /libpod/in_memory_state.go | |
| parent | 0ccc88813e3e3a385ecdefbe971c1664193cd682 (diff) | |
| parent | 8452b768ec96e84cd09766bddb65a34835844d6d (diff) | |
| download | podman-db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd.tar.gz podman-db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd.tar.bz2 podman-db5e7ec4c42adf8ff97d9b19116ab6dbcbb616cd.zip | |
Merge pull request #8947 from Luap99/cleanup-code
Fix problems reported by staticcheck
Diffstat (limited to 'libpod/in_memory_state.go')
| -rw-r--r-- | libpod/in_memory_state.go | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go index 6c0cde531..9285589b1 100644 --- a/libpod/in_memory_state.go +++ b/libpod/in_memory_state.go @@ -437,12 +437,8 @@ func (s *InMemoryState) RemoveContainer(ctr *Container) error { } // Remove our network aliases - if _, ok := s.ctrNetworkAliases[ctr.ID()]; ok { - delete(s.ctrNetworkAliases, ctr.ID()) - } - if _, ok := s.ctrNetworks[ctr.ID()]; ok { - delete(s.ctrNetworks, ctr.ID()) - } + delete(s.ctrNetworkAliases, ctr.ID()) + delete(s.ctrNetworks, ctr.ID()) return nil } @@ -680,9 +676,7 @@ func (s *InMemoryState) NetworkDisconnect(ctr *Container, network string) error ctrAliases = make(map[string][]string) s.ctrNetworkAliases[ctr.ID()] = ctrAliases } - if _, ok := ctrAliases[network]; ok { - delete(ctrAliases, network) - } + delete(ctrAliases, network) return nil } @@ -1523,12 +1517,8 @@ func (s *InMemoryState) RemoveContainerFromPod(pod *Pod, ctr *Container) error { } // Remove our network aliases - if _, ok := s.ctrNetworkAliases[ctr.ID()]; ok { - delete(s.ctrNetworkAliases, ctr.ID()) - } - if _, ok := s.ctrNetworks[ctr.ID()]; ok { - delete(s.ctrNetworks, ctr.ID()) - } + delete(s.ctrNetworkAliases, ctr.ID()) + delete(s.ctrNetworks, ctr.ID()) return nil } |