cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 11:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix names: s/fd/r/

Browse Source 
R=r
DELTA=9  (0 added, 0 deleted, 9 changed)
OCL=25593
CL=25593
This commit is contained in:
Russ Cox 2009-03-02 16:12:04 -08:00
parent 96750f130c
commit e9b40580ba
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/io/io.go
View File

@ -58,10 +58,10 @@ func WriteString(w Write, s string) (n int, err *os.Error) {
} }
// Read until buffer is full, EOF, or error // Read until buffer is full, EOF, or error
func Readn(fd Read, buf []byte) (n int, err *os.Error) { func Readn(r Read, buf []byte) (n int, err *os.Error) {
n = 0; n = 0;
for n < len(buf) { for n < len(buf) {
nn, e := fd.Read(buf[n:len(buf)]); nn, e := r.Read(buf[n:len(buf)]);
if nn > 0 { if nn > 0 {
n += nn n += nn
} }
@ -78,20 +78,20 @@ func Readn(fd Read, buf []byte) (n int, err *os.Error) {
// Convert something that implements Read into something // Convert something that implements Read into something
// whose Reads are always Readn // whose Reads are always Readn
type fullRead struct { type fullRead struct {
fd Read; r Read;
} }
func (fd *fullRead) Read(p []byte) (n int, err *os.Error) { func (fr *fullRead) Read(p []byte) (n int, err *os.Error) {
n, err = Readn(fd.fd, p); n, err = Readn(fr.r, p);
return n, err return n, err
} }
func MakeFullReader(fd Read) Read { func MakeFullReader(r Read) Read {
if fr, ok := fd.(*fullRead); ok { if fr, ok := r.(*fullRead); ok {
// already a fullRead // already a fullRead
return fd return r
} }
return &fullRead(fd) return &fullRead(r)
} }
// Copies n bytes (or until EOF is reached) from src to dst. // Copies n bytes (or until EOF is reached) from src to dst.