github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

remove unnecessary err object from SplitBytes

pull/1435/head
Darien Raymond 2018-11-18 19:44:32 +01:00
parent 842a089dad
commit cb7646f682
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
7 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/buf/multi_buffer.go
View File

@ -18,8 +18,7 @@ func ReadAllToBytes(reader io.Reader) ([]byte, error) {
return nil, nil return nil, nil
} }
b := make([]byte, mb.Len()) b := make([]byte, mb.Len())
mb, _, err = SplitBytes(mb, b) mb, _ = SplitBytes(mb, b)
common.Must(err)
ReleaseMulti(mb) ReleaseMulti(mb)
return b, nil return b, nil
} }
@ -95,7 +94,7 @@ func ReadFrom(reader io.Reader) (MultiBuffer, error) {
} }
} }
func SplitBytes(mb MultiBuffer, b []byte) (MultiBuffer, int, error) { func SplitBytes(mb MultiBuffer, b []byte) (MultiBuffer, int) {
totalBytes := 0 totalBytes := 0
for len(mb) > 0 { for len(mb) > 0 {
@ -110,7 +109,7 @@ func SplitBytes(mb MultiBuffer, b []byte) (MultiBuffer, int, error) {
mb = mb[1:] mb = mb[1:]
} }
return mb, totalBytes, nil return mb, totalBytes
} }
// Len returns the total number of bytes in the MultiBuffer. // Len returns the total number of bytes in the MultiBuffer.
@ -188,9 +187,9 @@ func (c *MultiBufferContainer) Read(b []byte) (int, error) {
return 0, io.EOF return 0, io.EOF
} }
mb, nBytes, err := SplitBytes(c.MultiBuffer, b) mb, nBytes := SplitBytes(c.MultiBuffer, b)
c.MultiBuffer = mb c.MultiBuffer = mb
return nBytes, err return nBytes, nil
} }
func (c *MultiBufferContainer) ReadMultiBuffer() (MultiBuffer, error) { func (c *MultiBufferContainer) ReadMultiBuffer() (MultiBuffer, error) {

3
common/buf/multi_buffer_test.go
View File

@ -21,8 +21,7 @@ func TestMultiBufferRead(t *testing.T) {
mb := MultiBuffer{b1, b2} mb := MultiBuffer{b1, b2}
bs := make([]byte, 32) bs := make([]byte, 32)
_, nBytes, err := SplitBytes(mb, bs) _, nBytes := SplitBytes(mb, bs)
assert(err, IsNil)
assert(nBytes, Equals, 4) assert(nBytes, Equals, 4)
assert(bs[:nBytes], Equals, []byte("abcd")) assert(bs[:nBytes], Equals, []byte("abcd"))
} }

6
common/buf/reader.go
View File

@ -46,8 +46,7 @@ func (r *BufferedReader) ReadByte() (byte, error) {
// Read implements io.Reader. It reads from internal buffer first (if available) and then reads from the underlying reader. // Read implements io.Reader. It reads from internal buffer first (if available) and then reads from the underlying reader.
func (r *BufferedReader) Read(b []byte) (int, error) { func (r *BufferedReader) Read(b []byte) (int, error) {
if !r.Buffer.IsEmpty() { if !r.Buffer.IsEmpty() {
buffer, nBytes, err := SplitBytes(r.Buffer, b) buffer, nBytes := SplitBytes(r.Buffer, b)
common.Must(err)
r.Buffer = buffer r.Buffer = buffer
if r.Buffer.IsEmpty() { if r.Buffer.IsEmpty() {
r.Buffer = nil r.Buffer = nil
@ -60,8 +59,7 @@ func (r *BufferedReader) Read(b []byte) (int, error) {
return 0, err return 0, err
} }
mb, nBytes, err := SplitBytes(mb, b) mb, nBytes := SplitBytes(mb, b)
common.Must(err)
if !mb.IsEmpty() { if !mb.IsEmpty() {
r.Buffer = mb r.Buffer = mb
} }

3
common/buf/readv_test.go
View File

@ -57,8 +57,7 @@ func TestReadvReader(t *testing.T) {
} }
rdata := make([]byte, size) rdata := make([]byte, size)
_, _, err = SplitBytes(rmb, rdata) SplitBytes(rmb, rdata)
common.Must(err)
if err := compare.BytesEqualWithDetail(data, rdata); err != nil { if err := compare.BytesEqualWithDetail(data, rdata); err != nil {
t.Fatal(err) t.Fatal(err)

3
common/crypto/auth.go
View File

@ -285,8 +285,7 @@ func (w *AuthenticationWriter) writeStream(mb buf.MultiBuffer) error {
rawBytes := temp.Extend(payloadSize) rawBytes := temp.Extend(payloadSize)
for { for {
nb, nBytes, err := buf.SplitBytes(mb, rawBytes) nb, nBytes := buf.SplitBytes(mb, rawBytes)
common.Must(err)
mb = nb mb = nb
eb, err := w.seal(rawBytes[:nBytes]) eb, err := w.seal(rawBytes[:nBytes])

2
proxy/shadowsocks/ota.go
View File

@ -116,7 +116,7 @@ func (w *ChunkWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
defer buf.ReleaseMulti(mb) defer buf.ReleaseMulti(mb)
for { for {
mb, payloadLen, _ := buf.SplitBytes(mb, w.buffer[2+AuthSize:]) mb, payloadLen := buf.SplitBytes(mb, w.buffer[2+AuthSize:])
binary.BigEndian.PutUint16(w.buffer, uint16(payloadLen)) binary.BigEndian.PutUint16(w.buffer, uint16(payloadLen))
w.auth.Authenticate(w.buffer[2+AuthSize:2+AuthSize+payloadLen], w.buffer[2:]) w.auth.Authenticate(w.buffer[2+AuthSize:2+AuthSize+payloadLen], w.buffer[2:])
if err := buf.WriteAllBytes(w.writer, w.buffer[:2+AuthSize+payloadLen]); err != nil { if err := buf.WriteAllBytes(w.writer, w.buffer[:2+AuthSize+payloadLen]); err != nil {

4
transport/internet/kcp/receiving.go
View File

@ -3,7 +3,6 @@ package kcp
import ( import (
"sync" "sync"
"v2ray.com/core/common"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
) )
@ -209,8 +208,7 @@ func (w *ReceivingWorker) Read(b []byte) int {
if mb.IsEmpty() { if mb.IsEmpty() {
return 0 return 0
} }
mb, nBytes, err := buf.SplitBytes(mb, b) mb, nBytes := buf.SplitBytes(mb, b)
common.Must(err)
if !mb.IsEmpty() { if !mb.IsEmpty() {
w.leftOver = mb w.leftOver = mb
} }