diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-23 06:32:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-23 06:32:41 -0400 |
commit | 2df9bdc00948e24855f3da42e31a6d273861e380 (patch) | |
tree | a2b25921510922eb921c24bc13fb95228d41e0b7 /pkg/api | |
parent | 31231ffd748d10048e6541b18fd863a66342c6c7 (diff) | |
parent | 5b4af0584d1c66b4f8d3d721374541fb76b5b395 (diff) | |
download | podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.gz podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.bz2 podman-2df9bdc00948e24855f3da42e31a6d273861e380.zip |
Merge pull request #13973 from Luap99/linter-revive
replace golint with revive linter
Diffstat (limited to 'pkg/api')
-rw-r--r-- | pkg/api/handlers/compat/containers_archive.go | 3 | ||||
-rw-r--r-- | pkg/api/handlers/libpod/containers_create.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index f2ff4d100..45b13818b 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -2,7 +2,6 @@ package compat import ( "encoding/json" - "fmt" "net/http" "os" @@ -28,7 +27,7 @@ func Archive(w http.ResponseWriter, r *http.Request) { case http.MethodHead, http.MethodGet: handleHeadAndGet(w, r, decoder, runtime) default: - utils.Error(w, http.StatusNotImplemented, errors.New(fmt.Sprintf("unsupported method: %v", r.Method))) + utils.Error(w, http.StatusNotImplemented, errors.Errorf("unsupported method: %v", r.Method)) } } diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index 1043dec4d..4fff9e345 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -45,7 +45,7 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) { // need to check for memory limit to adjust swap if sg.ResourceLimits != nil && sg.ResourceLimits.Memory != nil { s := "" - var l int64 = 0 + var l int64 if sg.ResourceLimits.Memory.Swap != nil { s = strconv.Itoa(int(*sg.ResourceLimits.Memory.Swap)) } |