From 6d770d6f3099eabcc7922dec5862c5a1c66fdb6f Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Thu, 15 Nov 2018 19:59:23 +0100 Subject: [PATCH] remove unused members --- common/buf/copy.go | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/common/buf/copy.go b/common/buf/copy.go index 8f0429e5..fa0757cd 100644 --- a/common/buf/copy.go +++ b/common/buf/copy.go @@ -9,34 +9,11 @@ import ( "v2ray.com/core/common/signal" ) -type errorHandler func(error) error type dataHandler func(MultiBuffer) //go:notinheap type copyHandler struct { - onReadError []errorHandler - onData []dataHandler - onWriteError []errorHandler -} - -func (h *copyHandler) readFrom(reader Reader) (MultiBuffer, error) { - mb, err := reader.ReadMultiBuffer() - if err != nil { - for _, handler := range h.onReadError { - err = handler(err) - } - } - return mb, err -} - -func (h *copyHandler) writeTo(writer Writer, mb MultiBuffer) error { - err := writer.WriteMultiBuffer(mb) - if err != nil { - for _, handler := range h.onWriteError { - err = handler(err) - } - } - return err + onData []dataHandler } // SizeCounter is for counting bytes copied by Copy(). @@ -101,13 +78,13 @@ func IsWriteError(err error) bool { func copyInternal(reader Reader, writer Writer, handler *copyHandler) error { for { - buffer, err := handler.readFrom(reader) + buffer, err := reader.ReadMultiBuffer() if !buffer.IsEmpty() { for _, handler := range handler.onData { handler(buffer) } - if werr := handler.writeTo(writer, buffer); werr != nil { + if werr := writer.WriteMultiBuffer(buffer); werr != nil { return writeError{werr} } }