Fix problems reported by staticcheck

`staticcheck` is a golang code analysis tool. https://staticcheck.io/

This commit fixes a lot of problems found in our code. Common problems are:
- unnecessary use of fmt.Sprintf
- duplicated imports with different names
- unnecessary check that a key exists before a delete call

There are still a lot of reported problems in the test files but I have
not looked at those.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>

2 files changed, 3 insertions, 3 deletions

diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go
index 87bb947ed..5e96a654a 100644
--- a/cmd/podman/system/prune.go
+++ b/cmd/podman/system/prune.go
@@ -20,11 +20,11 @@ import (
 var (
 	pruneOptions     = entities.SystemPruneOptions{}
 	filters          []string
-	pruneDescription = fmt.Sprintf(`
+	pruneDescription = `
 	podman system prune
 
         Remove unused data
-`)
+`
 
 	pruneCommand = &cobra.Command{
 		Use:               "prune [options]",
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index f8bdbfa10..f5760e172 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -80,7 +80,7 @@ func service(cmd *cobra.Command, args []string) error {
 		}
 
 		// socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer.
-		if "unix" == uri.Scheme && !registry.IsRemote() {
+		if uri.Scheme == "unix" && !registry.IsRemote() {
 			if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) {
 				return err
 			}