diff options
Diffstat (limited to 'libgo/go/archive')
-rw-r--r-- | libgo/go/archive/tar/reader.go | 4 | ||||
-rw-r--r-- | libgo/go/archive/zip/reader.go | 3 | ||||
-rw-r--r-- | libgo/go/archive/zip/reader_test.go | 6 | ||||
-rw-r--r-- | libgo/go/archive/zip/writer_test.go | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/libgo/go/archive/tar/reader.go b/libgo/go/archive/tar/reader.go index 65bf120..facba2c 100644 --- a/libgo/go/archive/tar/reader.go +++ b/libgo/go/archive/tar/reader.go @@ -29,7 +29,7 @@ var ( // tr := tar.NewReader(r) // for { // hdr, err := tr.Next() -// if err == os.EOF { +// if err == io.EOF { // // end of tar archive // break // } @@ -200,7 +200,7 @@ func (tr *Reader) readHeader() *Header { } // Read reads from the current entry in the tar archive. -// It returns 0, os.EOF when it reaches the end of that entry, +// It returns 0, io.EOF when it reaches the end of that entry, // until Next is called to advance to the next entry. func (tr *Reader) Read(b []byte) (n int, err error) { if tr.nb == 0 { diff --git a/libgo/go/archive/zip/reader.go b/libgo/go/archive/zip/reader.go index 64152b4..cfbe549 100644 --- a/libgo/go/archive/zip/reader.go +++ b/libgo/go/archive/zip/reader.go @@ -7,10 +7,10 @@ package zip import ( "bufio" "compress/flate" + "encoding/binary" "errors" "hash" "hash/crc32" - "encoding/binary" "io" "io/ioutil" "os" @@ -60,6 +60,7 @@ func OpenReader(name string) (*ReadCloser, error) { f.Close() return nil, err } + r.f = f return r, nil } diff --git a/libgo/go/archive/zip/reader_test.go b/libgo/go/archive/zip/reader_test.go index 4d80aab..ca0b04e 100644 --- a/libgo/go/archive/zip/reader_test.go +++ b/libgo/go/archive/zip/reader_test.go @@ -98,7 +98,11 @@ func readTestZip(t *testing.T, zt ZipTest) { if err == FormatError { return } - defer z.Close() + defer func() { + if err := z.Close(); err != nil { + t.Errorf("error %q when closing zip file", err) + } + }() // bail here if no Files expected to be tested // (there may actually be files in the zip, but we don't care) diff --git a/libgo/go/archive/zip/writer_test.go b/libgo/go/archive/zip/writer_test.go index b562f84..25491dc 100644 --- a/libgo/go/archive/zip/writer_test.go +++ b/libgo/go/archive/zip/writer_test.go @@ -7,7 +7,7 @@ package zip import ( "bytes" "io/ioutil" - "rand" + "math/rand" "testing" ) |