fix names: s/fd/r/
R=r
DELTA=9 (0 added, 0 deleted, 9 changed)
OCL=25593
CL=25593
diff --git a/src/lib/io/io.go b/src/lib/io/io.go
index c34ddcd..0325912 100644
--- a/src/lib/io/io.go
+++ b/src/lib/io/io.go
@@ -58,10 +58,10 @@
}
// 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;
for n < len(buf) {
- nn, e := fd.Read(buf[n:len(buf)]);
+ nn, e := r.Read(buf[n:len(buf)]);
if nn > 0 {
n += nn
}
@@ -78,20 +78,20 @@
// Convert something that implements Read into something
// whose Reads are always Readn
type fullRead struct {
- fd Read;
+ r Read;
}
-func (fd *fullRead) Read(p []byte) (n int, err *os.Error) {
- n, err = Readn(fd.fd, p);
+func (fr *fullRead) Read(p []byte) (n int, err *os.Error) {
+ n, err = Readn(fr.r, p);
return n, err
}
-func MakeFullReader(fd Read) Read {
- if fr, ok := fd.(*fullRead); ok {
+func MakeFullReader(r Read) Read {
+ if fr, ok := r.(*fullRead); ok {
// 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.
