aboutsummaryrefslogtreecommitdiff
path: root/pkg/util
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-22 15:14:38 +0100
committerGitHub <noreply@github.com>2022-03-22 15:14:38 +0100
commit901066acd113ee3bea709cc558d86c4c438e2f67 (patch)
tree018a8f7918b50e9d1bc58f7ce9a981f628c3d295 /pkg/util
parentfc963159b8078c7e3ca6571174fb3a82d1023b43 (diff)
parent06dd9136a253521cb74497a59f2e6894806a5b6d (diff)
downloadpodman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.gz
podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.bz2
podman-901066acd113ee3bea709cc558d86c4c438e2f67.zip
Merge pull request #13580 from vrothberg/enable-linters
enable linters
Diffstat (limited to 'pkg/util')
-rw-r--r--pkg/util/camelcase/camelcase.go4
-rw-r--r--pkg/util/utils.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/util/camelcase/camelcase.go b/pkg/util/camelcase/camelcase.go
index d27ac00d6..eaf7c0178 100644
--- a/pkg/util/camelcase/camelcase.go
+++ b/pkg/util/camelcase/camelcase.go
@@ -51,10 +51,10 @@ func Split(src string) (entries []string) {
}
entries = []string{}
var runes [][]rune
- lastClass := 0
- class := 0
+ var lastClass int
// split into fields based on class of unicode character
for _, r := range src {
+ var class int
switch {
case unicode.IsLower(r):
class = 1
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 925ff9830..1beb3b28e 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -727,7 +727,7 @@ func SocketPath() (string, error) {
func LookupUser(name string) (*user.User, error) {
// Assume UID look up first, if it fails lookup by username
if u, err := user.LookupId(name); err == nil {
- return u, err
+ return u, nil
}
return user.Lookup(name)
}