lint warnings

2 files changed, 15 insertions, 24 deletions

diff --git a/internal/io/fs/readfile.go b/internal/io/fs/readfile.go
index 669f99f..dc1d8ea 100644
--- a/internal/io/fs/readfile.go
+++ b/internal/io/fs/readfile.go
@@ -116,23 +116,19 @@ func (f *readFile) makeReader() (*bufio.Reader, *os.File, error) {
 	return f.makeFileReader()
 }
 
-func (f *readFile) makeFileReader() (*bufio.Reader, *os.File, error) {
-	var reader *bufio.Reader
-	fd, err := os.Open(f.filePath)
-	if err != nil {
-		return reader, fd, err
+func (f *readFile) makeFileReader() (reader *bufio.Reader, fd *os.File, err error) {
+	if fd, err = os.Open(f.filePath); err != nil {
+		return
 	}
 
 	if f.seekEOF {
-		fd.Seek(0, io.SeekEnd)
+		if _, err = fd.Seek(0, io.SeekEnd); err != nil {
+			return
+		}
 	}
 
 	reader, err = f.makeCompressedFileReader(fd)
-	if err != nil {
-		return reader, fd, err
-	}
-
-	return reader, fd, nil
+	return
 }
 
 func (f *readFile) makePipeReader() (*bufio.Reader, *os.File, error) {
@@ -249,7 +245,7 @@ func (f *readFile) truncated(fd *os.File) (bool, error) {
 	dlog.Common.Debug(f.filePath, "File truncation check")
 
 	// Can not seek currently open FD.
-	currentPosition, err := fd.Seek(0, os.SEEK_CUR)
+	currentPosition, err := fd.Seek(0, io.SeekCurrent)
 	if err != nil {
 		return true, err
 	}
diff --git a/internal/io/fs/readfilelcontext.go b/internal/io/fs/readfilelcontext.go
index 44ce17d..87d59d6 100644
--- a/internal/io/fs/readfilelcontext.go
+++ b/internal/io/fs/readfilelcontext.go
@@ -31,22 +31,17 @@ type ltxState struct {
 func (f *readFile) filterWithoutLContext(ctx context.Context, rawLines <-chan *bytes.Buffer,
 	lines chan<- *line.Line, re regex.Regex) {
 
-	for {
-		select {
-		case rawLine, ok := <-rawLines:
-			f.updatePosition()
-			if !ok {
+	for rawLine := range rawLines {
+		f.updatePosition()
+		if newLine, ok := f.transmittable(rawLine, len(lines), cap(lines), re); ok {
+			select {
+			case lines <- newLine:
+			case <-ctx.Done():
 				return
 			}
-			if newLine, ok := f.transmittable(rawLine, len(lines), cap(lines), re); ok {
-				select {
-				case lines <- newLine:
-				case <-ctx.Done():
-					return
-				}
-			}
 		}
 	}
+	f.updatePosition()
 }
 
 // Filter log lines matching a given regular expression, however with local grep context.