Skip to content

Commit

Permalink
Remove some style complaints. (#181)
Browse files Browse the repository at this point in the history
* Remove some style complaints.
  • Loading branch information
klauspost committed Nov 14, 2019
1 parent ce4ce46 commit c791a01
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 9 deletions.
3 changes: 3 additions & 0 deletions flate/flate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ func TestRegressions(t *testing.T) {
t.Fatal(err)
}
data1, err := ioutil.ReadAll(data)
if err != nil {
t.Fatal(err)
}
for level := 0; level <= 9; level++ {
t.Run(fmt.Sprint(tt.Name+"-level", 1), func(t *testing.T) {
buf := new(bytes.Buffer)
Expand Down
3 changes: 0 additions & 3 deletions flate/huffman_bit_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,15 +463,12 @@ func (w *huffmanBitWriter) writeDynamicHeader(numLiterals int, numOffsets int, n
case 16:
w.writeBits(int32(w.codegen[i]), 2)
i++
break
case 17:
w.writeBits(int32(w.codegen[i]), 3)
i++
break
case 18:
w.writeBits(int32(w.codegen[i]), 7)
i++
break
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions flate/huffman_code.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,14 @@ func generateFixedLiteralEncoding() *huffmanEncoder {
// size 8, 000110000 .. 10111111
bits = ch + 48
size = 8
break
case ch < 256:
// size 9, 110010000 .. 111111111
bits = ch + 400 - 144
size = 9
break
case ch < 280:
// size 7, 0000000 .. 0010111
bits = ch - 256
size = 7
break
default:
// size 8, 11000000 .. 11000111
bits = ch + 192 - 280
Expand Down
2 changes: 1 addition & 1 deletion s2/encode.go
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ func (w *Writer) Close() error {
return err
}
_, err2 := w.writer.Write(frame)
err = w.err(err2)
_ = w.err(err2)
}
_ = w.err(errClosed)
if err == errClosed {
Expand Down
2 changes: 1 addition & 1 deletion s2/s2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func roundtrip(b, ebuf, dbuf []byte) error {
}
concat = concat[len(dst):]

d, err = Decode(nil, concat)
d, _ = Decode(nil, concat)
want := append(make([]byte, 0, len(b)*3), b...)
want = append(want, b...)
want = append(want, b...)
Expand Down
12 changes: 12 additions & 0 deletions zstd/decoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,9 @@ func TestDecoderMultiFrame(t *testing.T) {
t.Fatal(err)
}
got, err := ioutil.ReadAll(dec)
if err != nil {
t.Fatal(err)
}
err = dec.Reset(bytes.NewBuffer(in))
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -651,6 +654,9 @@ func TestDecoderMultiFrameReset(t *testing.T) {
t.Fatal(err)
}
got, err := ioutil.ReadAll(dec)
if err != nil {
t.Fatal(err)
}
err = dec.Reset(bytes.NewBuffer(in))
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -792,6 +798,9 @@ func BenchmarkDecoder_DecoderSmall(b *testing.B) {
b.Fatal(err)
}
got, err := ioutil.ReadAll(dec)
if err != nil {
b.Fatal(err)
}
b.SetBytes(int64(len(got)))
b.ReportAllocs()
b.ResetTimer()
Expand Down Expand Up @@ -840,6 +849,9 @@ func BenchmarkDecoder_DecodeAll(b *testing.B) {
b.Fatal(err)
}
got, err := dec.DecodeAll(in, nil)
if err != nil {
b.Fatal(err)
}
b.SetBytes(int64(len(got)))
b.ReportAllocs()
b.ResetTimer()
Expand Down
9 changes: 9 additions & 0 deletions zstd/encoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,9 @@ func testEncoderRoundtrip(t *testing.T, file string, wantCRC []byte) {
t.Fatal(err)
}
gotSize, err = io.Copy(io.MultiWriter(fout, d), dec2)
if err != nil {
t.Fatal(err)
}
}
if wantSize != gotSize {
t.Errorf("want size (%d) != got size (%d)", wantSize, gotSize)
Expand Down Expand Up @@ -589,6 +592,9 @@ func testEncoderRoundtripWriter(t *testing.T, file string, wantCRC []byte) {
t.Fatal(err)
}
gotSize, err = io.Copy(io.MultiWriter(fout, d), dec2)
if err != nil {
t.Fatal(err)
}
}
if wantSize != gotSize {
t.Errorf("want size (%d) != got size (%d)", wantSize, gotSize)
Expand Down Expand Up @@ -675,6 +681,9 @@ func TestEncoder_EncodeAllEmpty(t *testing.T) {
var buf bytes.Buffer
e.Reset(&buf)
err = e.Close()
if err != nil {
t.Fatal(err)
}
dst = buf.Bytes()
if len(dst) == 0 {
t.Fatal("Requested zero frame, but got nothing.")
Expand Down
3 changes: 2 additions & 1 deletion zstd/framedec.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,10 @@ func (d *frameDec) runDecoder(dst []byte, dec *blockDec) ([]byte, error) {
if err == nil {
if n != len(dst)-crcStart {
err = io.ErrShortWrite
} else {
err = d.checkCRC()
}
}
err = d.checkCRC()
}
}
d.history.b = saved
Expand Down

0 comments on commit c791a01

Please sign in to comment.