Skip to content

Commit 7613989

Browse files
committed
CompressingReader: support older Go versions
Signed-off-by: Alex Dubov <[email protected]>
1 parent 4a80a2f commit 7613989

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

compressing_reader.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,10 @@ func (wr *ovWriter) reset(out []byte) bool {
204204
wr.ov = wr.ov[ : 0]
205205
wr.ovPos = 0
206206
wr.dataPos = ovRem
207-
}
208-
209-
if wr.ovPos > 0 {
207+
} else if wr.ovPos > 0 {
210208
wr.ov = wr.ov[ : 0]
211209
wr.ovPos = 0
210+
wr.dataPos = 0
212211
}
213212

214213
wr.data = out

compressing_reader_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package lz4_test
33
import (
44
"bytes"
55
"fmt"
6-
"io"
7-
"os"
6+
"io/ioutil"
87
"strings"
98
"testing"
109

@@ -35,26 +34,26 @@ func TestCompressingReader(t *testing.T) {
3534
option := option
3635
t.Parallel()
3736

38-
raw, err := os.ReadFile(fname)
37+
raw, err := ioutil.ReadFile(fname)
3938
if err != nil {
4039
t.Fatal(err)
4140
}
42-
r := io.NopCloser(bytes.NewReader(raw))
41+
r := ioutil.NopCloser(bytes.NewReader(raw))
4342

4443
// Compress.
4544
zcomp := lz4.NewCompressingReader(r)
4645
if err := zcomp.Apply(option, lz4.CompressionLevelOption(lz4.Level1)); err != nil {
4746
t.Fatal(err)
4847
}
4948

50-
zout, err := io.ReadAll(zcomp)
49+
zout, err := ioutil.ReadAll(zcomp)
5150
if err != nil {
5251
t.Fatal(err)
5352
}
5453

5554
// Uncompress.
5655
zr := lz4.NewReader(bytes.NewReader(zout))
57-
out, err := io.ReadAll(zr)
56+
out, err := ioutil.ReadAll(zr)
5857
if err != nil {
5958
t.Fatal(err)
6059
}

0 commit comments

Comments
 (0)