lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-02 23:35:40 -05:00
Code Issues Releases Wiki Activity

remove NewMultiBufferCap

Browse Source
This commit is contained in:
Darien Raymond
2018-11-16 11:29:16 +01:00
parent 2364f5f280
commit 48cac1733f
7 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/buf/multi_buffer.go
View File

@@ -10,7 +10,7 @@ import (
// ReadAllToMultiBuffer reads all content from the reader into a MultiBuffer, until EOF.
func ReadAllToMultiBuffer(reader io.Reader) (MultiBuffer, error) {
mb := NewMultiBufferCap(128)
mb := make(MultiBuffer, 0, 128)
if _, err := mb.ReadFrom(reader); err != nil {
mb.Release()
@@ -38,11 +38,6 @@ func ReadAllToBytes(reader io.Reader) ([]byte, error) {
// MultiBuffer is a list of Buffers. The order of Buffer matters.
type MultiBuffer []*Buffer
// NewMultiBufferCap creates a new MultiBuffer instance.
func NewMultiBufferCap(capacity int32) MultiBuffer {
return MultiBuffer(make([]*Buffer, 0, capacity))
}
// Append appends buffer to the end of this MultiBuffer
func (mb *MultiBuffer) Append(buf *Buffer) {
if buf != nil {
@@ -159,13 +154,13 @@ func (mb *MultiBuffer) WriteMultiBuffer(b MultiBuffer) error {
}
// Len returns the total number of bytes in the MultiBuffer.
func (mb *MultiBuffer) Len() int32 {
func (mb MultiBuffer) Len() int32 {
if mb == nil {
return 0
}
size := int32(0)
for _, b := range *mb {
for _, b := range mb {
size += b.Len()
}
return size
@@ -200,7 +195,7 @@ func (mb MultiBuffer) String() string {
// SliceBySize splits the beginning of this MultiBuffer into another one, for at most size bytes.
func (mb *MultiBuffer) SliceBySize(size int32) MultiBuffer {
slice := NewMultiBufferCap(10)
slice := make(MultiBuffer, 0, 10)
sliceSize := int32(0)
endIndex := len(*mb)
for i, b := range *mb {