Merge pull request #1 from asymmetric-research/marctrem/linereader-should-only-return-read-size

marctrem · web-flow · commit 3b9f1880e13a · 2024-09-12T14:31:57.000-04:00
linereader: only return written size
diff --git a/io/linereader/linereader.go b/io/linereader/linereader.go
@@ -32,7 +32,7 @@ func NewInto(dst *T, reader io.Reader, blockSize uint) {
 func (lr *T) Read(dst []byte) (n int, err error) {
 	n, discarded, err := lr.ReadExtra(dst)
 	if discarded != 0 {
-		return n + discarded, errors.New("line too long")
+		return n, errors.New("line too long")
 	}
 	return n, err
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func NewInto(dst *T, reader io.Reader, blockSize uint) {`
`32`	`32`	`func (lr *T) Read(dst []byte) (n int, err error) {`
`33`	`33`	`n, discarded, err := lr.ReadExtra(dst)`
`34`	`34`	`if discarded != 0 {`
`35`		`- return n + discarded, errors.New("line too long")`
	`35`	`+ return n, errors.New("line too long")`
`36`	`36`	`}`
`37`	`37`	`return n, err`
`38`	`38`	`}`