containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename ReadByte to readByte 

It is only used internally, and this avoids a warning
about a conflict with io.ByteReader.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2022-09-26 20:26:26 +02:00
parent 020008f16a
commit 876c6afc80
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/pkg/chunked/compressor/compressor.go
View File

@ -33,11 +33,11 @@ const (
holesFinderStateEOF
)
// ReadByte reads a single byte from the underlying reader.
// readByte reads a single byte from the underlying reader.
// If a single byte is read, the return value is (0, RAW-BYTE-VALUE, nil).
// If there are at least f.THRESHOLD consecutive zeros, then the
// return value is (N_CONSECUTIVE_ZEROS, '\x00').
func (f *holesFinder) ReadByte() (int64, byte, error) {
func (f *holesFinder) readByte() (int64, byte, error) {
for {
switch f.state {
// reading the file stream
@ -159,7 +159,7 @@ func (rc *rollingChecksumReader) Read(b []byte) (bool, int, error) {
}
for i := 0; i < len(b); i++ {
holeLen, n, err := rc.reader.ReadByte()
holeLen, n, err := rc.reader.readByte()
if err != nil {
if err == io.EOF {
rc.closed = true

16
storage/pkg/chunked/compressor/compressor_test.go
View File

@ -15,7 +15,7 @@ func TestHole(t *testing.T) {
reader: bufio.NewReader(bytes.NewReader(data)),
}
hole, _, err := hf.ReadByte()
hole, _, err := hf.readByte()
if err != nil {
t.Errorf("got error: %v", err)
}
@ -23,7 +23,7 @@ func TestHole(t *testing.T) {
t.Error("expected hole not found")
}
if _, _, err := hf.ReadByte(); err != io.EOF {
if _, _, err := hf.readByte(); err != io.EOF {
t.Errorf("EOF not found")
}
@ -32,7 +32,7 @@ func TestHole(t *testing.T) {
reader: bufio.NewReader(bytes.NewReader(data)),
}
for i := 0; i < 5; i++ {
hole, b, err := hf.ReadByte()
hole, b, err := hf.readByte()
if err != nil {
t.Errorf("got error: %v", err)
}
@ -43,7 +43,7 @@ func TestHole(t *testing.T) {
t.Error("wrong read")
}
}
if _, _, err := hf.ReadByte(); err != io.EOF {
if _, _, err := hf.readByte(); err != io.EOF {
t.Error("didn't receive EOF")
}
}
@ -56,7 +56,7 @@ func TestTwoHoles(t *testing.T) {
reader: bufio.NewReader(bytes.NewReader(data)),
}
hole, _, err := hf.ReadByte()
hole, _, err := hf.readByte()
if err != nil {
t.Errorf("got error: %v", err)
}
@ -65,7 +65,7 @@ func TestTwoHoles(t *testing.T) {
}
for _, e := range []byte("FOO") {
hole, c, err := hf.ReadByte()
hole, c, err := hf.readByte()
if err != nil {
t.Errorf("got error: %v", err)
}
@ -76,7 +76,7 @@ func TestTwoHoles(t *testing.T) {
t.Errorf("wrong byte read %v instead of %v", c, e)
}
}
hole, _, err = hf.ReadByte()
hole, _, err = hf.readByte()
if err != nil {
t.Errorf("got error: %v", err)
}
@ -84,7 +84,7 @@ func TestTwoHoles(t *testing.T) {
t.Error("expected hole not found")
}
if _, _, err := hf.ReadByte(); err != io.EOF {
if _, _, err := hf.readByte(); err != io.EOF {
t.Error("didn't receive EOF")
}
}