aboutsummaryrefslogtreecommitdiffstats
path: root/formats
diff options
context:
space:
mode:
Diffstat (limited to 'formats')
-rw-r--r--formats/packfile/common.go8
-rw-r--r--formats/packfile/reader.go10
2 files changed, 9 insertions, 9 deletions
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)
}