qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 22:17:58 -07:00
Code Releases Activity

fix io.Bytebuffer.Read for new EOF semantics

Browse Source 
R=rsc
DELTA=7  (5 added, 0 deleted, 2 changed)
OCL=30657
CL=30659
This commit is contained in:
Rob Pike 2009-06-23 15:20:40 -07:00
parent 28ba9777e6
commit 5766553380
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pkg/io/bytebuffer.go
View File

@ -87,8 +87,13 @@ func (b *ByteBuffer) WriteByte(c byte) os.Error {
}
// Read reads the next len(p) bytes from the buffer or until the buffer
// is drained. The return value n is the number of bytes read; err is always nil.
// is drained. The return value n is the number of bytes read. If the
// buffer has no data to return, err is os.EOF even if len(p) is zero;
// otherwise it is nil.
func (b *ByteBuffer) Read(p []byte) (n int, err os.Error) {
if b.off >= len(b.buf) {
return 0, os.EOF
}
m := b.Len();
n = len(p);
@ -99,7 +104,7 @@ func (b *ByteBuffer) Read(p []byte) (n int, err os.Error) {
bytecopy(p, 0, b.buf, b.off, n);
b.off += n;
return n, nil
return n, err
}
// ReadByte reads and returns the next byte from the buffer.