zip: fix staticcheck errors
Reported by dmitshur in a comment in CL 202042.
Change-Id: I913bd87d9a17a9cf19ac869f8b7166b05e839758
Reviewed-on: https://go-review.googlesource.com/c/mod/+/218237
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/zip/zip.go b/zip/zip.go
index 37c7642..6bdc01f 100644
--- a/zip/zip.go
+++ b/zip/zip.go
@@ -247,6 +247,9 @@
var files []File
err = filepath.Walk(dir, func(filePath string, info os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
relPath, err := filepath.Rel(dir, filePath)
if err != nil {
return err
diff --git a/zip/zip_test.go b/zip/zip_test.go
index abdbefc..b8f7192 100644
--- a/zip/zip_test.go
+++ b/zip/zip_test.go
@@ -89,7 +89,7 @@
if f.data != nil {
return ioutil.NopCloser(bytes.NewReader(f.data)), nil
}
- if f.size < 0 || f.size >= uint64(modzip.MaxZipFile<<1) {
+ if f.size >= uint64(modzip.MaxZipFile<<1) {
return nil, fmt.Errorf("cannot open fakeFile of size %d", f.size)
}
return ioutil.NopCloser(io.LimitReader(zeroReader{}, int64(f.size))), nil
