Make fs.CheckClose public to stop duplication

This commit is contained in:
Nick Craig-Wood
2015-12-17 13:30:58 +00:00
parent 7a24532224
commit ac65d8369e
4 changed files with 6 additions and 25 deletions
+1 -11
View File
@@ -9,7 +9,6 @@ package hubic
import (
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"time"
@@ -103,15 +102,6 @@ func (f *Fs) String() string {
return fmt.Sprintf("Hubic %s", f.Fs.String())
}
// checkClose is a utility function used to check the return from
// Close in a defer statement.
func checkClose(c io.Closer, err *error) {
cerr := c.Close()
if *err == nil {
*err = cerr
}
}
// getCredentials reads the OpenStack Credentials using the Hubic API
//
// The credentials are read into the Fs
@@ -125,7 +115,7 @@ func (f *Fs) getCredentials() (err error) {
if err != nil {
return err
}
defer checkClose(resp.Body, &err)
defer fs.CheckClose(resp.Body, &err)
if resp.StatusCode < 200 || resp.StatusCode > 299 {
return fmt.Errorf("Failed to get credentials: %s", resp.Status)
}