1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-26 01:15:38 +00:00

clean lint warnings

This commit is contained in:
Darien Raymond 2017-02-20 10:33:35 +01:00
parent 7a97d73737
commit bf7906c7f0
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
7 changed files with 13 additions and 14 deletions

View File

@ -118,7 +118,7 @@ func getDefaultPoolSize() uint32 {
}
func init() {
var size uint32 = getDefaultPoolSize()
size := getDefaultPoolSize()
sizeStr := os.Getenv(poolSizeEnvKey)
if len(sizeStr) > 0 {
customSize, err := strconv.ParseUint(sizeStr, 10, 32)

View File

@ -11,7 +11,7 @@ type BufferedReader struct {
buffered bool
}
// NewReader creates a new BufferedReader based on an io.Reader.
// NewBufferedReader creates a new BufferedReader based on an io.Reader.
func NewBufferedReader(rawReader io.Reader) *BufferedReader {
return &BufferedReader{
reader: rawReader,

View File

@ -14,7 +14,7 @@ type BufferedWriter struct {
buffered bool
}
// NewWriter creates a new BufferedWriter.
// NewBufferedWriter creates a new BufferedWriter.
func NewBufferedWriter(rawWriter io.Writer) *BufferedWriter {
return &BufferedWriter{
writer: rawWriter,

View File

@ -24,7 +24,7 @@ func TestBufferedWriter(t *testing.T) {
assert.Bool(content.IsEmpty()).IsTrue()
writer.SetBuffered(false)
assert.Error(writer.SetBuffered(false)).IsNil()
assert.Int(content.Len()).Equals(16)
}

View File

@ -76,7 +76,7 @@ func NewReader(reader io.Reader) Reader {
// ToBytesReader converts a Reaaer to io.Reader.
func ToBytesReader(stream Reader) io.Reader {
return &BufferToBytesReader{
return &bufferToBytesReader{
stream: stream,
}
}
@ -90,7 +90,7 @@ func NewWriter(writer io.Writer) Writer {
// ToBytesWriter converts a Writer to io.Writer
func ToBytesWriter(writer Writer) io.Writer {
return &BytesToBufferWriter{
return &bytesToBufferWriter{
writer: writer,
}
}

View File

@ -43,15 +43,14 @@ func (v *BytesToBufferReader) Read() (*Buffer, error) {
return buffer, nil
}
type BufferToBytesReader struct {
type bufferToBytesReader struct {
stream Reader
current *Buffer
err error
}
// Fill fills in the internal buffer.
// Private: Visible for testing.
func (v *BufferToBytesReader) Fill() {
// fill fills in the internal buffer.
func (v *bufferToBytesReader) fill() {
b, err := v.stream.Read()
v.current = b
if err != nil {
@ -60,13 +59,13 @@ func (v *BufferToBytesReader) Fill() {
}
}
func (v *BufferToBytesReader) Read(b []byte) (int, error) {
func (v *bufferToBytesReader) Read(b []byte) (int, error) {
if v.err != nil {
return 0, v.err
}
if v.current == nil {
v.Fill()
v.fill()
if v.err != nil {
return 0, v.err
}

View File

@ -23,11 +23,11 @@ func (v *BufferToBytesWriter) Write(buffer *Buffer) error {
return nil
}
type BytesToBufferWriter struct {
type bytesToBufferWriter struct {
writer Writer
}
func (v *BytesToBufferWriter) Write(payload []byte) (int, error) {
func (v *bytesToBufferWriter) Write(payload []byte) (int, error) {
bytesWritten := 0
size := len(payload)
for size > 0 {