From 92f4b7af1073b6cdd0786ce2090d6e446e0903ad Mon Sep 17 00:00:00 2001
From: Jeff Halter <868228+jhalter@users.noreply.github.com>
Date: Sun, 15 Mar 2026 20:48:45 -0700
Subject: Extract shared readFrom helper to deduplicate io.Reader boilerplate

13 types implemented identical offset-based io.Reader patterns with
5-7 lines of copy-and-offset-tracking code each. Extract a shared
readFrom(p, offset, data) helper and reduce each Read() method to a
one-liner delegating to it.
---
 hotline/file_transfer.go | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'hotline/file_transfer.go')

diff --git a/hotline/file_transfer.go b/hotline/file_transfer.go
index e8acbb3..e5898db 100644
--- a/hotline/file_transfer.go
+++ b/hotline/file_transfer.go
@@ -241,14 +241,7 @@ func (fh *FileHeader) Read(p []byte) (int, error) {
 		fh.FilePath,
 	)
 
-	if fh.readOffset >= len(buf) {
-		return 0, io.EOF // All bytes have been read
-	}
-
-	n := copy(p, buf[fh.readOffset:])
-	fh.readOffset += n
-
-	return n, nil
+	return readFrom(p, &fh.readOffset, buf)
 }
 
 func DownloadHandler(w io.Writer, fullPath string, fileTransfer *FileTransfer, fs FileStore, rLogger *slog.Logger, preserveForks bool) error {
-- 
cgit