From 655dbe69d08780043b1c34c5bfebddcfd6a887a7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 20 Jul 2025 23:10:17 +0200 Subject: [PATCH] pkg/tailfile: rename vars that shadowed type Signed-off-by: Sebastiaan van Stijn --- pkg/tailfile/tailfile.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/tailfile/tailfile.go b/pkg/tailfile/tailfile.go index a77435030f..aa39fb603d 100644 --- a/pkg/tailfile/tailfile.go +++ b/pkg/tailfile/tailfile.go @@ -32,10 +32,10 @@ func TailFile(f *os.File, n int) ([][]byte, error) { } buf := make([][]byte, 0, nLines) - scanner := bufio.NewScanner(r) + s := bufio.NewScanner(r) - for scanner.Scan() { - buf = append(buf, scanner.Bytes()) + for s.Scan() { + buf = append(buf, s.Bytes()) } return buf, nil } @@ -74,22 +74,22 @@ func NewTailReaderWithDelimiter(ctx context.Context, r SizeReaderAt, reqLines in return io.NewSectionReader(bytes.NewReader(nil), 0, 0), 0, nil } - scanner := newScanner(r, delimiter) - for scanner.Scan(ctx) { - if err := scanner.Err(); err != nil { - return nil, 0, scanner.Err() + s := newScanner(r, delimiter) + for s.Scan(ctx) { + if err := s.Err(); err != nil { + return nil, 0, s.Err() } found++ if found == 1 { - tailEnd = scanner.End() + tailEnd = s.End() } if found == reqLines { break } } - tailStart = scanner.Start(ctx) + tailStart = s.Start(ctx) if found == 0 { return io.NewSectionReader(bytes.NewReader(nil), 0, 0), 0, nil