From e339a7e7316f552d76cf97af92e2b95bb05a077b Mon Sep 17 00:00:00 2001 From: Nico Grashoff Date: Thu, 21 Dec 2023 17:31:44 +0100 Subject: [PATCH] Return close error --- geozip.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/geozip.go b/geozip.go index e214487..3a6513f 100644 --- a/geozip.go +++ b/geozip.go @@ -111,7 +111,7 @@ func downloadURL(cc string) string { return fmt.Sprintf("https://download.geonames.org/export/zip/%s.zip", cc) } -func download(url, etag string) ([]byte, bool, string, error) { +func download(url, etag string) (_ []byte, _ bool, _ string, err error) { req, err := http.NewRequest(http.MethodGet, url, nil) if err != nil { return nil, false, "", err @@ -122,7 +122,9 @@ func download(url, etag string) ([]byte, bool, string, error) { return nil, false, "", err } defer func(Body io.ReadCloser) { - err = Body.Close() + if closeErr := Body.Close(); closeErr != nil { + err = closeErr + } }(resp.Body) if resp.StatusCode == http.StatusNotModified {