From c3e4c774659ac3dfd8b813a1cf23ede16277f0d1 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Fri, 8 May 2015 16:05:20 -0400 Subject: [PATCH] Emit `errcheck`-passing code --- Makefile | 13 +++++++++++++ release.go | 10 ++++++++-- testdata/out/compress-memcopy.go | 5 ++++- testdata/out/compress-nomemcopy.go | 5 ++++- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2b7f162..27085bf 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,16 @@ +all: regen check + regen: go install ./... make -C testdata regen + +.PHONY: check +check: errcheck + errcheck testdata/out/compress-memcopy.go + errcheck testdata/out/compress-nomemcopy.go + errcheck testdata/out/debug.go + errcheck testdata/out/nocompress-memcopy.go + errcheck testdata/out/nocompress-nomemcopy.go + +errcheck: + go get github.com/kisielk/errcheck diff --git a/release.go b/release.go index 7c33e08..f97c2cf 100644 --- a/release.go +++ b/release.go @@ -129,11 +129,14 @@ func bindata_read(data, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %%q: %%v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } @@ -164,11 +167,14 @@ func bindata_read(data []byte, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %%q: %%v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } diff --git a/testdata/out/compress-memcopy.go b/testdata/out/compress-memcopy.go index 35697ed..a132fec 100644 --- a/testdata/out/compress-memcopy.go +++ b/testdata/out/compress-memcopy.go @@ -21,11 +21,14 @@ func bindata_read(data []byte, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %q: %v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } diff --git a/testdata/out/compress-nomemcopy.go b/testdata/out/compress-nomemcopy.go index 8bfc87a..20d1c86 100644 --- a/testdata/out/compress-nomemcopy.go +++ b/testdata/out/compress-nomemcopy.go @@ -31,11 +31,14 @@ func bindata_read(data, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %q: %v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil }