Merge branch 'lukeshu/lint'

3 files changed, 11 insertions, 9 deletions

diff --git a/lib/btrfs/btrfssum/csum.go b/lib/btrfs/btrfssum/csum.go
index 770f6ea..6df9efd 100644
--- a/lib/btrfs/btrfssum/csum.go
+++ b/lib/btrfs/btrfssum/csum.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+// Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -70,6 +70,7 @@ func (typ CSumType) String() string {
 }
 
 func (typ CSumType) Size() int {
+	//nolint:gomnd // This is where we define the magic numbers.
 	sizes := map[CSumType]int{
 		TYPE_CRC32:  4,
 		TYPE_XXHASH: 8,
diff --git a/lib/btrfs/btrfssum/csum_test.go b/lib/btrfs/btrfssum/csum_test.go
index d8ccbfc..0a4aef6 100644
--- a/lib/btrfs/btrfssum/csum_test.go
+++ b/lib/btrfs/btrfssum/csum_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+// Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -26,7 +26,7 @@ func TestCSumFormat(t *testing.T) {
 		"x":     {InputSum: csum, InputFmt: "%x", Output: "bd7b41f400000000000000000000000000000000000000000000000000000000"},
 		"v":     {InputSum: csum, InputFmt: "%v", Output: "bd7b41f400000000000000000000000000000000000000000000000000000000"},
 		"70s":   {InputSum: csum, InputFmt: "|% 70s", Output: "|      bd7b41f400000000000000000000000000000000000000000000000000000000"},
-		"#180v": {InputSum: csum, InputFmt: "%#180v", Output: "   btrfssum.CSum{0xbd, 0x7b, 0x41, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}"},
+		"#180v": {InputSum: csum, InputFmt: "%#180v", Output: "   btrfssum.CSum{0xbd, 0x7b, 0x41, 0xf4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}"}, //nolint:dupword
 	}
 	for tcName, tc := range testcases {
 		tc := tc
diff --git a/lib/btrfs/btrfssum/shortsum.go b/lib/btrfs/btrfssum/shortsum.go
index 6fd0c68..c3d6f8b 100644
--- a/lib/btrfs/btrfssum/shortsum.go
+++ b/lib/btrfs/btrfssum/shortsum.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+// Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -56,10 +56,11 @@ func (sum ShortSum) EncodeJSON(w io.Writer) error {
 }
 
 func deHex(r rune) (byte, bool) {
-	if r > 0xff {
+	if r > math.MaxUint8 {
 		return 0, false
 	}
 	c := byte(r)
+	//nolint:gomnd // Hex conversion.
 	switch {
 	case '0' <= c && c <= '9':
 		return c - '0', true
@@ -130,7 +131,7 @@ func (run SumRun[Addr]) Get(sumIdx int64) (ShortSum, error) {
 		return "", io.EOF
 	}
 	off := int(sumIdx) * run.ChecksumSize
-	return ShortSum(run.Sums[off : off+run.ChecksumSize]), nil
+	return run.Sums[off : off+run.ChecksumSize], nil
 }
 
 func (run SumRun[Addr]) SumForAddr(addr Addr) (ShortSum, bool) {
@@ -138,7 +139,7 @@ func (run SumRun[Addr]) SumForAddr(addr Addr) (ShortSum, bool) {
 		return "", false
 	}
 	off := int((addr-run.Addr)/BlockSize) * run.ChecksumSize
-	return ShortSum(run.Sums[off : off+run.ChecksumSize]), true
+	return run.Sums[off : off+run.ChecksumSize], true
 }
 
 func (run SumRun[Addr]) Walk(ctx context.Context, fn func(Addr, ShortSum) error) error {
@@ -146,7 +147,7 @@ func (run SumRun[Addr]) Walk(ctx context.Context, fn func(Addr, ShortSum) error)
 		if err := ctx.Err(); err != nil {
 			return err
 		}
-		if err := fn(addr, ShortSum(run.Sums[off:off+run.ChecksumSize])); err != nil {
+		if err := fn(addr, run.Sums[off:off+run.ChecksumSize]); err != nil {
 			return err
 		}
 	}
@@ -207,7 +208,7 @@ func (sg SumRunWithGaps[Addr]) SumForAddr(addr Addr) (ShortSum, error) {
 			continue
 		}
 		off := int((addr-run.Addr)/BlockSize) * run.ChecksumSize
-		return ShortSum(run.Sums[off : off+run.ChecksumSize]), nil
+		return run.Sums[off : off+run.ChecksumSize], nil
 	}
 	return "", diskio.ErrWildcard
 }