From 69630f37fcebe894b15872148bd8b2496806b60c Mon Sep 17 00:00:00 2001 From: Joseph Richey Date: Sun, 11 Feb 2018 23:56:49 -0800 Subject: vet: eliminate unnecessary shadowing Running "go vet -shadow ./..." finds all places where a variable might be incorrectly or unnecessarily shadowed. This fixes some of them. --- metadata/policy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'metadata/policy.go') diff --git a/metadata/policy.go b/metadata/policy.go index 533d48a..ce40f9c 100644 --- a/metadata/policy.go +++ b/metadata/policy.go @@ -86,7 +86,7 @@ func GetPolicy(path string) (*PolicyData, error) { defer file.Close() var policy unix.FscryptPolicy - if err := policyIoctl(file, unix.FS_IOC_GET_ENCRYPTION_POLICY, &policy); err != nil { + if err = policyIoctl(file, unix.FS_IOC_GET_ENCRYPTION_POLICY, &policy); err != nil { return nil, errors.Wrapf(err, "get encryption policy %s", path) } @@ -119,7 +119,7 @@ func SetPolicy(path string, data *PolicyData) error { } defer file.Close() - if err := data.CheckValidity(); err != nil { + if err = data.CheckValidity(); err != nil { return errors.Wrap(err, "invalid policy") } -- cgit v1.2.3