update msgio (combine)
Juan Batiz-Benet committed
Dec 10, 2014 at 22:35 UTC
477f5c8838428d1924df3d5b12594a39df187233
2 files changed
+7
-2
Godeps/Godeps.json
+1
-1
@@ -106,7 +106,7 @@
106
},
107
{
108
"ImportPath": "github.com/jbenet/go-msgio",
109
- "Rev": "8361f0f6c783f09419ec3d8dd75fe950744f5e91"
109
+ "Rev": "634f25d82673bbdb0b87b8d7e1b7a3df59ede671"
110
},
111
{
112
"ImportPath": "github.com/jbenet/go-multiaddr",
Godeps/_workspace/src/github.com/jbenet/go-msgio/msgio.go
+6
-1
@@ -209,13 +209,18 @@ type readWriter struct {
209
210
// NewReadWriter wraps an io.ReadWriter with a msgio.ReadWriter. Writing
211
// and Reading will be appropriately framed.
212
-func NewReadWriter(rw io.ReadWriter) ReadWriter {
212
+func NewReadWriter(rw io.ReadWriter) ReadWriteCloser {
213
return &readWriter{
214
Reader: NewReader(rw),
215
Writer: NewWriter(rw),
216
}
217
}
218
219
+// Combine wraps a pair of msgio.Writer and msgio.Reader with a msgio.ReadWriter.
220
+func Combine(w Writer, r Reader) ReadWriteCloser {
221
+ return &readWriter{Reader: r, Writer: w}
222
+}
223
+
224
func (rw *readWriter) Close() error {
225
var errs []error
226