1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-30 07:46:41 -04:00

revert buffer api change

This commit is contained in:
Darien Raymond 2016-11-19 21:13:00 +01:00
parent 87a8f7a953
commit 18cd10be2b
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 11 additions and 13 deletions

View File

@ -16,20 +16,18 @@ const (
// the buffer into an internal buffer pool, in order to recreate a buffer more
// quickly.
type Buffer struct {
head []byte
pool Pool
Value []byte
offset int
startingOffset int
head []byte
pool Pool
Value []byte
offset int
}
func CreateBuffer(container []byte, offset int, parent Pool) *Buffer {
func CreateBuffer(container []byte, parent Pool) *Buffer {
b := new(Buffer)
b.head = container
b.pool = parent
b.Value = b.head[offset:]
b.offset = offset
b.startingOffset = offset
b.Value = b.head[defaultOffset:]
b.offset = defaultOffset
return b
}
@ -49,14 +47,14 @@ func (b *Buffer) Release() {
// Clear clears the content of the buffer, results an empty buffer with
// Len() = 0.
func (b *Buffer) Clear() *Buffer {
b.offset = b.startingOffset
b.offset = defaultOffset
b.Value = b.head[b.offset:b.offset]
return b
}
// Reset resets this Buffer into its original state.
func (b *Buffer) Reset() *Buffer {
b.offset = b.startingOffset
b.offset = defaultOffset
b.Value = b.head[b.offset:]
return b
}
@ -221,5 +219,5 @@ func NewBuffer() *Buffer {
//}
func NewLocalBuffer(size int) *Buffer {
return CreateBuffer(make([]byte, size), defaultOffset, nil)
return CreateBuffer(make([]byte, size), nil)
}

View File

@ -36,7 +36,7 @@ func (p *BufferPool) Allocate() *Buffer {
default:
b = p.allocator.Get().([]byte)
}
return CreateBuffer(b, defaultOffset, p)
return CreateBuffer(b, p)
}
func (p *BufferPool) Free(buffer *Buffer) {