Skip to content

chores: use Peek and Discard #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbqvq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chores: use Peek and Discard #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,21 +542,22 @@
return io.Copy(w, p.conn)
}

b := make([]byte, p.bufReader.Buffered())
if _, err := io.ReadFull(p.bufReader, b); err != nil {
b, err := p.bufReader.Peek(p.bufReader.Buffered())
if err != nil {
return 0, err // this should never happen as we read buffered data.
}

// Garbage collect the buffer.
p.bufReader = nil

var n int64
{
nn, err := w.Write(b)
p.bufReader.Discard(nn)

Check failure on line 553 in protocol.go

View workflow job for this annotation

GitHub Actions / lint (1.26) 

Error return value of `p.bufReader.Discard` is not checked (errcheck)

Check failure on line 553 in protocol.go

View workflow job for this annotation

GitHub Actions / lint (1.27) 

Error return value of `p.bufReader.Discard` is not checked (errcheck)
n += int64(nn)
if err != nil {
return n, err
}

// Garbage collect the buffer.
p.bufReader = nil
}
{
nn, err := io.Copy(w, p.conn)
Expand Down
Loading