diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-06 22:37:27 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-06 22:37:27 +0000 |
| commit | 6736ef96eab222e58e6294f42be981a5afb59811 (patch) | |
| tree | 2bc668fae9bf96f9a3988e0b0a16685bde8c4f0b /libgo/go/io | |
| parent | 38a138411da4206c53f9a153ee9c3624fce58a52 (diff) | |
| download | gcc-6736ef96eab222e58e6294f42be981a5afb59811.zip gcc-6736ef96eab222e58e6294f42be981a5afb59811.tar.gz gcc-6736ef96eab222e58e6294f42be981a5afb59811.tar.bz2 | |
libgo: Merge to master revision 19184.
The next revision, 19185, renames several runtime files, and
will be handled in a separate change.
From-SVN: r211328
Diffstat (limited to 'libgo/go/io')
| -rw-r--r-- | libgo/go/io/multi.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libgo/go/io/multi.go b/libgo/go/io/multi.go index 2c7e816..ab8dd5d 100644 --- a/libgo/go/io/multi.go +++ b/libgo/go/io/multi.go @@ -26,7 +26,8 @@ func (mr *multiReader) Read(p []byte) (n int, err error) { // MultiReader returns a Reader that's the logical concatenation of // the provided input readers. They're read sequentially. Once all -// inputs are drained, Read will return EOF. +// inputs have returned EOF, Read will return EOF. If any of the readers +// return a non-nil, non-EOF error, Read will return that error. func MultiReader(readers ...Reader) Reader { return &multiReader{readers} } |