Remove unnecessary rac CompressedSize field

This commit is contained in:
Nigel Tao committed 2019-08-09 15:31:03 +10:00
1 parent a61d735d54
commit 08798669eb
7 files changed
+48 -49

No files matched your search

+11 -7
View File
@@ -62,11 +62,6 @@ type Reader struct {
// Nil is an invalid value.
ReadSeeker io.ReadSeeker
// CompressedSize is the size of the RAC file.
//
// Zero is an invalid value, as an empty file is not a valid RAC file.
CompressedSize int64
// CodecReaders are the compression codecs that this Reader can decompress.
//
// For example, use a raczlib.CodecReader from the sibilng "raczlib"
@@ -144,9 +139,18 @@ func (r *Reader) initialize() error {
r.err = errInvalidReadSeeker
return r.err
}
if size, err := r.ReadSeeker.Seek(0, io.SeekEnd); err != nil {
r.err = err
return r.err
} else {
r.parser.compressedSize = size
}
if _, err := r.ReadSeeker.Seek(0, io.SeekStart); err != nil {
r.err = err
return r.err
}
r.parser.ReadSeeker = r.ReadSeeker
r.parser.CompressedSize = r.CompressedSize
r.currChunk.R = r.ReadSeeker
return nil
}
@@ -316,7 +320,7 @@ func (r *Reader) nextChunk() error {
return r.err
}
rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.CompressedSize, chunk)
rctx, err := codecReader.MakeReaderContext(r.ReadSeeker, r.parser.compressedSize, chunk)
if err != nil {
if err == io.EOF {
err = io.ErrUnexpectedEOF