lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-10-04 16:14:02 -04:00
Code Issues Releases Wiki Activity

remove closure on ReadFullFrom

Browse Source
This commit is contained in:
Darien Raymond
2018-11-02 15:01:33 +01:00
parent 9360448c59
commit 58e2ed3381
27 changed files with 158 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/buf/multi_buffer.go
View File

@@ -79,7 +79,7 @@ func (mb *MultiBuffer) ReadFrom(reader io.Reader) (int64, error) {
for {
b := New()
err := b.Reset(ReadFullFrom(reader, Size))
_, err := b.ReadFullFrom(reader, Size)
if b.IsEmpty() {
b.Release()
} else {
@@ -220,7 +220,7 @@ func (mb *MultiBuffer) SliceBySize(size int32) MultiBuffer {
*mb = (*mb)[endIndex:]
if endIndex == 0 && len(*mb) > 0 {
b := New()
common.Must(b.Reset(ReadFullFrom((*mb)[0], size)))
common.Must2(b.ReadFullFrom((*mb)[0], size))
return NewMultiBufferValue(b)
}
return slice