From cbb64ca271f419c9bd9a5546a046bc02958d5263 Mon Sep 17 00:00:00 2001
From: Petr Pucil <petr.pucil@seznam.cz>
Date: Fri, 2 Aug 2024 15:02:25 +0200
Subject: [PATCH] Fix style issues reported by `golangci-lint`

---
 kaitai/stream.go | 3 +--
 kaitai/util.go   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kaitai/stream.go b/kaitai/stream.go
index ccdfead..c7bcfff 100644
--- 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
index cfbf52c..96950e3 100644
--- 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]
 }