From c791a018193a7d390a706fb03f2dbf298658fe2a Mon Sep 17 00:00:00 2001
From: Klaus Post <klauspost@gmail.com>
Date: Thu, 14 Nov 2019 12:12:11 +0300
Subject: [PATCH] Remove some style complaints. (#181)

* Remove some style complaints.
---
 flate/flate_test.go         |  3 +++
 flate/huffman_bit_writer.go |  3 ---
 flate/huffman_code.go       |  3 ---
 s2/encode.go                |  2 +-
 s2/s2_test.go               |  2 +-
 zstd/decoder_test.go        | 12 ++++++++++++
 zstd/encoder_test.go        |  9 +++++++++
 zstd/framedec.go            |  3 ++-
 8 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/flate/flate_test.go b/flate/flate_test.go
index 2258484ba3..2d83d678ff 100644
--- a/flate/flate_test.go
+++ b/flate/flate_test.go
@@ -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)
diff --git a/flate/huffman_bit_writer.go b/flate/huffman_bit_writer.go
index 5ed476aa0d..54a23533f8 100644
--- a/flate/huffman_bit_writer.go
+++ b/flate/huffman_bit_writer.go
@@ -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
 		}
 	}
 }
diff --git a/flate/huffman_code.go b/flate/huffman_code.go
index d0099599c5..1810c6898d 100644
--- a/flate/huffman_code.go
+++ b/flate/huffman_code.go
@@ -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
diff --git a/s2/encode.go b/s2/encode.go
index fc828895be..121d184fce 100644
--- a/s2/encode.go
+++ b/s2/encode.go
@@ -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 {
diff --git a/s2/s2_test.go b/s2/s2_test.go
index d90c21c84c..010e934713 100644
--- a/s2/s2_test.go
+++ b/s2/s2_test.go
@@ -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...)
diff --git a/zstd/decoder_test.go b/zstd/decoder_test.go
index 78f26c17f4..148a7079e4 100644
--- a/zstd/decoder_test.go
+++ b/zstd/decoder_test.go
@@ -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)
@@ -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)
@@ -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()
@@ -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()
diff --git a/zstd/encoder_test.go b/zstd/encoder_test.go
index 53fe6f6437..ef1b1e92a5 100644
--- a/zstd/encoder_test.go
+++ b/zstd/encoder_test.go
@@ -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)
@@ -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)
@@ -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.")
diff --git a/zstd/framedec.go b/zstd/framedec.go
index 9e00437a2e..40790747a3 100644
--- a/zstd/framedec.go
+++ b/zstd/framedec.go
@@ -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