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

fix lint warnings

Browse Source
This commit is contained in:
Darien Raymond
2018-05-31 11:55:11 +02:00
parent fe3ddb0ef5
commit adade2bffd
19 changed files with 159 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/buf/writer.go
View File

@@ -12,13 +12,6 @@ type BufferToBytesWriter struct {
io.Writer
}
// NewBufferToBytesWriter returns a new BufferToBytesWriter.
func NewBufferToBytesWriter(writer io.Writer) *BufferToBytesWriter {
return &BufferToBytesWriter{
Writer: writer,
}
}
// WriteMultiBuffer implements Writer. This method takes ownership of the given buffer.
func (w *BufferToBytesWriter) WriteMultiBuffer(mb MultiBuffer) error {
defer mb.Release()
@@ -113,7 +106,16 @@ func (w *BufferedWriter) WriteMultiBuffer(b MultiBuffer) error {
// Flush flushes buffered content into underlying writer.
func (w *BufferedWriter) Flush() error {
if !w.buffer.IsEmpty() {
if err := w.writer.WriteMultiBuffer(NewMultiBufferValue(w.buffer)); err != nil {
b := w.buffer
w.buffer = nil
if writer, ok := w.writer.(io.Writer); ok {
_, err := writer.Write(b.Bytes())
b.Release()
if err != nil {
return err
}
} else if err := w.writer.WriteMultiBuffer(NewMultiBufferValue(b)); err != nil {
return err
}