Fix style issues reported by golangci-lint

kaitai-io · Aug 2, 2024 · cbb64ca · cbb64ca
1 parent 83c47c9
commit cbb64ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/kaitai/stream.go b/kaitai/stream.go
@@ -325,9 +325,8 @@ func (k *Stream) ReadBytesTermMulti(term []byte, includeTerm, consumeTerm, eosEr
 				}
 				r = append(r, c[:n]...)
 				return r, nil
-			} else {
-				return nil, fmt.Errorf("ReadBytesTermMulti: %w", err)
 			}
+			return nil, fmt.Errorf("ReadBytesTermMulti: %w", err)
 		}
 		if bytes.Equal(c, term) {
 			if includeTerm {

diff --git a/kaitai/util.go b/kaitai/util.go
@@ -83,7 +83,7 @@ func BytesTerminate(s []byte, term byte, includeTerm bool) []byte {
 	}
 	newLen := termIndex
 	if includeTerm {
-		newLen += 1
+		newLen++
 	}
 	return s[:newLen]
 }