diff options
| -rw-r--r-- | commit.go | 2 | ||||
| -rw-r--r-- | common.go | 8 | ||||
| -rw-r--r-- | file.go | 2 | ||||
| -rw-r--r-- | formats/packfile/common.go | 8 | ||||
| -rw-r--r-- | formats/packfile/reader.go | 10 | ||||
| -rw-r--r-- | repository.go | 2 | ||||
| -rw-r--r-- | tag.go | 2 | ||||
| -rw-r--r-- | tree.go | 2 |
8 files changed, 18 insertions, 18 deletions
@@ -61,7 +61,7 @@ func (c *Commit) Decode(o core.Object) (err error) { if err != nil { return err } - defer close(reader, &err) + defer checkClose(reader, &err) r := bufio.NewReader(reader) @@ -22,21 +22,21 @@ func countLines(s string) int { return nEOL + 1 } -// close is used with defer to close the given io.Closer and check its +// checkClose is used with defer to close the given io.Closer and check its // returned error value. If Close returns an error and the given *error // is not nil, *error is set to the error returned by Close. // -// close is typically used with named return values like so: +// checkClose is typically used with named return values like so: // // func do(obj *Object) (err error) { // w, err := obj.Writer() // if err != nil { // return nil // } -// defer close(w, &err) +// defer checkClose(w, &err) // // work with w // } -func close(c io.Closer, err *error) { +func checkClose(c io.Closer, err *error) { if cerr := c.Close(); cerr != nil && *err == nil { *err = cerr } @@ -23,7 +23,7 @@ func (f *File) Contents() (content string, err error) { if err != nil { return "", err } - defer close(reader, &err) + defer checkClose(reader, &err) buf := new(bytes.Buffer) buf.ReadFrom(reader) diff --git a/formats/packfile/common.go b/formats/packfile/common.go index d207563..b5f8de2 100644 --- a/formats/packfile/common.go +++ b/formats/packfile/common.go @@ -42,21 +42,21 @@ func (t *trackingReader) ReadByte() (c byte, err error) { return p[0], nil } -// close is used with defer to close the given io.Closer and check its +// checkClose is used with defer to close the given io.Closer and check its // returned error value. If Close returns an error and the given *error // is not nil, *error is set to the error returned by Close. // -// close is typically used with named return values like so: +// checkClose is typically used with named return values like so: // // func do(obj *Object) (err error) { // w, err := obj.Writer() // if err != nil { // return nil // } -// defer close(w, &err) +// defer checkClose(w, &err) // // work with w // } -func close(c io.Closer, err *error) { +func checkClose(c io.Closer, err *error) { if cerr := c.Close(); cerr != nil && *err == nil { *err = cerr } diff --git a/formats/packfile/reader.go b/formats/packfile/reader.go index e14b84e..702daca 100644 --- a/formats/packfile/reader.go +++ b/formats/packfile/reader.go @@ -210,7 +210,7 @@ func (r *Reader) readREFDelta(raw core.Object) (err error) { if err != nil { return err } - defer close(reader, &err) + defer checkClose(reader, &err) d, err := ioutil.ReadAll(reader) if err != nil { @@ -229,7 +229,7 @@ func (r *Reader) readREFDelta(raw core.Object) (err error) { if err != nil { return err } - defer close(writer, &err) + defer checkClose(writer, &err) writer.Write(patched) @@ -262,7 +262,7 @@ func (r *Reader) readOFSDelta(raw core.Object, steps int64) (err error) { if err != nil { return err } - defer close(reader, &err) + defer checkClose(reader, &err) d, err := ioutil.ReadAll(reader) if err != nil { @@ -281,7 +281,7 @@ func (r *Reader) readOFSDelta(raw core.Object, steps int64) (err error) { if err != nil { return err } - defer close(writer, &err) + defer checkClose(writer, &err) writer.Write(patched) @@ -293,7 +293,7 @@ func (r *Reader) readObject(raw core.Object) (err error) { if err != nil { return err } - defer close(writer, &err) + defer checkClose(writer, &err) return r.inflate(writer) } diff --git a/repository.go b/repository.go index 0e741a7..451bb8f 100644 --- a/repository.go +++ b/repository.go @@ -79,7 +79,7 @@ func (r *Repository) Pull(remoteName, branch string) (err error) { if err != nil { return err } - defer close(reader, &err) + defer checkClose(reader, &err) pr := packfile.NewReader(reader) if _, err = pr.Read(r.Storage); err != nil { @@ -40,7 +40,7 @@ func (t *Tag) Decode(o core.Object) (err error) { if err != nil { return err } - defer close(reader, &err) + defer checkClose(reader, &err) r := bufio.NewReader(reader) for { @@ -145,7 +145,7 @@ func (t *Tree) Decode(o core.Object) (err error) { if err != nil { return err } - defer close(reader, &err) + defer checkClose(reader, &err) r := bufio.NewReader(reader) for { |