lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 10:08:15 -05:00
Code Issues Releases Wiki Activity

simplify ReadBuffer

Browse Source
This commit is contained in:
Darien Raymond 2019-02-10 10:53:16 +01:00
parent b0a015c7cc
commit a84897b4b6
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/buf/reader.go
View File

@ -37,19 +37,8 @@ func ReadBuffer(r io.Reader) (*Buffer, error) {
if nBytes > 0 { if nBytes > 0 {
common.Must(b.WriteByte(firstByte[0])) common.Must(b.WriteByte(firstByte[0]))
} }
for i := 0; i < 64; i++ { b.ReadFrom(r)
_, err := b.ReadFrom(r) return b, nil
if !b.IsEmpty() {
return b, nil
}
if err != nil {
b.Release()
return nil, err
}
}
b.Release()
return nil, newError("Reader returns too many empty payloads.")
} }
// BufferedReader is a Reader that keeps its internal buffer. // BufferedReader is a Reader that keeps its internal buffer.