From 58ac4bd938cc9c072b28756dc43350fd1fa7adef Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 5 Aug 2019 16:59:33 -0700 Subject: [PATCH] daemon/checkpoint: rm extra checks In this code, err is already checked to be nil (or non-nil), so no need to repeat extra checks. Fixes the following govet warnings: > daemon/checkpoint.go:38:12: nilness: tautological condition: nil == nil (govet) > case err == nil: > ^ > daemon/checkpoint.go:45:12: nilness: tautological condition: nil == nil (govet) > case err == nil && stat.IsDir(): > ^ > daemon/checkpoint.go:47:12: nilness: tautological condition: nil == nil (govet) > case err == nil: > ^ Signed-off-by: Kir Kolyshkin --- daemon/checkpoint.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/checkpoint.go b/daemon/checkpoint.go index 1c850b335b..3ec581e5fc 100644 --- a/daemon/checkpoint.go +++ b/daemon/checkpoint.go @@ -35,16 +35,16 @@ func getCheckpointDir(checkDir, checkpointID, ctrName, ctrID, ctrCheckpointDir s err2 = os.MkdirAll(checkpointAbsDir, 0700) case err != nil: err2 = err - case err == nil: + default: err2 = fmt.Errorf("%s exists and is not a directory", checkpointAbsDir) } } else { switch { case err != nil: err2 = fmt.Errorf("checkpoint %s does not exist for container %s", checkpointID, ctrName) - case err == nil && stat.IsDir(): + case stat.IsDir(): err2 = nil - case err == nil: + default: err2 = fmt.Errorf("%s exists and is not a directory", checkpointAbsDir) } }