diff options
| -rw-r--r-- | cmd/show-object/main.go | 2 | ||||
| -rw-r--r-- | internal/adler32/adler32_amd64.go | 4 | ||||
| -rw-r--r-- | internal/bufpool/buffers.go | 2 | ||||
| -rw-r--r-- | internal/zlib/writer.go | 4 | ||||
| -rw-r--r-- | objectid/objectid.go | 6 | ||||
| -rw-r--r-- | refstore/reftable/lookup.go | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/cmd/show-object/main.go b/cmd/show-object/main.go index 47326269..6d27ffad 100644 --- a/cmd/show-object/main.go +++ b/cmd/show-object/main.go @@ -27,7 +27,7 @@ func main() { } } -func run(repoPath *string, name *string) error { +func run(repoPath, name *string) error { root, err := os.OpenRoot(*repoPath) if err != nil { return fmt.Errorf("open repo root: %w", err) diff --git a/internal/adler32/adler32_amd64.go b/internal/adler32/adler32_amd64.go index a2c283b7..cb67f21c 100644 --- a/internal/adler32/adler32_amd64.go +++ b/internal/adler32/adler32_amd64.go @@ -14,9 +14,7 @@ import ( // Size of an Adler-32 checksum in bytes. const Size = 4 -var ( - hasAVX2 = cpu.X86.HasAVX2 -) +var hasAVX2 = cpu.X86.HasAVX2 // digest represents the partial evaluation of a checksum. // The low 16 bits are s1, the high 16 bits are s2. diff --git a/internal/bufpool/buffers.go b/internal/bufpool/buffers.go index cb86b17e..a5c27b67 100644 --- a/internal/bufpool/buffers.go +++ b/internal/bufpool/buffers.go @@ -179,7 +179,7 @@ func (buf *Buffer) ensureCapacity(needed int) { } } -func classFor(size int) (idx int, classCap int, ok bool) { +func classFor(size int) (idx, classCap int, ok bool) { for i, class := range sizeClasses { if size <= class { return i, class, true diff --git a/internal/zlib/writer.go b/internal/zlib/writer.go index 78ec8034..75a8ec1d 100644 --- a/internal/zlib/writer.go +++ b/internal/zlib/writer.go @@ -136,13 +136,13 @@ func (z *Writer) Write(p []byte) (n int, err error) { n, err = z.compressor.Write(p) if err != nil { z.err = err - return + return n, err } if _, err = z.digest.Write(p); err != nil { z.err = err return 0, z.err } - return + return n, err } // Flush flushes the Writer to its underlying [io.Writer]. diff --git a/objectid/objectid.go b/objectid/objectid.go index 2c085abf..7ce011f3 100644 --- a/objectid/objectid.go +++ b/objectid/objectid.go @@ -64,8 +64,10 @@ var algorithmTable = [...]algorithmDetails{ }, } -var algorithmByName = map[string]Algorithm{} -var supportedAlgorithms []Algorithm +var ( + algorithmByName = map[string]Algorithm{} + supportedAlgorithms []Algorithm +) func init() { for algo := Algorithm(0); int(algo) < len(algorithmTable); algo++ { diff --git a/refstore/reftable/lookup.go b/refstore/reftable/lookup.go index 724a3727..8862f7e6 100644 --- a/refstore/reftable/lookup.go +++ b/refstore/reftable/lookup.go @@ -225,7 +225,7 @@ func lookupChildPosInIndexBlock(block blockView, key string) (int, bool, error) } // lookupRecordInRefBlock searches one ref block and may short-circuit by sort order. -func lookupRecordInRefBlock(table *tableFile, block blockView, key string) (found bool, done bool, rec recordValue, err error) { +func lookupRecordInRefBlock(table *tableFile, block blockView, key string) (found, done bool, rec recordValue, err error) { off, recordsEnd, restarts, err := parseBlockLayout(block) if err != nil { return false, false, recordValue{}, err @@ -301,7 +301,7 @@ func forEachRecordInRefBlock(table *tableFile, block blockView, fn func(name str } // parseBlockLayout parses common record/restart regions for ref and index blocks. -func parseBlockLayout(block blockView) (recordsStart int, recordsEnd int, restarts []int, err error) { +func parseBlockLayout(block blockView) (recordsStart, recordsEnd int, restarts []int, err error) { if len(block.payload) < 6 { return 0, 0, nil, fmt.Errorf("short block") } |