Readn is a silly name when there's no n. Change to FullRead.

R=gri
DELTA=15  (0 added, 0 deleted, 15 changed)
OCL=27619
CL=27619

diff --git a/src/lib/exec_test.go b/src/lib/exec_test.go
index e67c75da3a0b8e98e62fdabab9ab1ac33872f95c..a1bb1f50e252126559ca743b652798bdb478a220 100644 (file)
--- a/src/lib/exec_test.go
+++ b/src/lib/exec_test.go
@@ -19,7 +19,7 @@ func TestRunCat(t *testing.T) {
        io.WriteString(cmd.Stdin, "hello, world\n");
        cmd.Stdin.Close();
        var buf [64]byte;
-       n, err1 := io.Readn(cmd.Stdout, &buf);
+       n, err1 := io.FullRead(cmd.Stdout, &buf);
        if err1 != nil && err1 != io.ErrEOF {
                t.Fatalf("reading from /bin/cat: %v", err1);
        }
@@ -38,7 +38,7 @@ func TestRunEcho(t *testing.T) {
                t.Fatalf("opencmd /bin/echo: %v", err);
        }
        var buf [64]byte;
-       n, err1 := io.Readn(cmd.Stdout, &buf);
+       n, err1 := io.FullRead(cmd.Stdout, &buf);
        if err1 != nil && err1 != io.ErrEOF {
                t.Fatalf("reading from /bin/echo: %v", err1);
        }

diff --git a/src/lib/http/fs.go b/src/lib/http/fs.go
index 23a994aa0d76d9bfb6f2333f16ec1e321fe9fa6e..c1e0ee69996c4ec070c6d25a387f76ba4f17823d 100644 (file)
--- a/src/lib/http/fs.go
+++ b/src/lib/http/fs.go
@@ -142,7 +142,7 @@ func serveFileInternal(c *Conn, r *Request, name string, redirect bool) {
        } else {
                // read first chunk to decide between utf-8 text and binary
                var buf [1024]byte;
-               n, err := io.Readn(f, &buf);
+               n, err := io.FullRead(f, &buf);
                b := buf[0:n];
                if isText(b) {
                        c.SetHeader("Content-Type", "text-plain; charset=utf-8");

diff --git a/src/lib/io/io.go b/src/lib/io/io.go
index 2c116687b9cad8dc07a04c0ad65016093f1cf8b5..5036e326a6e1acc0987aabe47182ea316ca49367 100644 (file)
--- a/src/lib/io/io.go
+++ b/src/lib/io/io.go
@@ -13,7 +13,7 @@ import (
        "os";
 )
 
-// ErrEOF is the error returned by Readn and Copyn when they encounter EOF.
+// ErrEOF is the error returned by FullRead and Copyn when they encounter EOF.
 var ErrEOF = os.NewError("EOF")
 
 // Read is the interface that wraps the basic Read method.
@@ -70,8 +70,8 @@ func WriteString(w Write, s string) (n int, err os.Error) {
        return w.Write(StringBytes(s))
 }
 
-// Readn reads r until the buffer buf is full, or until EOF or error.
-func Readn(r Read, buf []byte) (n int, err os.Error) {
+// FullRead reads r until the buffer buf is full, or until EOF or error.
+func FullRead(r Read, buf []byte) (n int, err os.Error) {
        n = 0;
        for n < len(buf) {
                nn, e := r.Read(buf[n:len(buf)]);
@@ -89,18 +89,18 @@ func Readn(r Read, buf []byte) (n int, err os.Error) {
 }
 
 // Convert something that implements Read into something
-// whose Reads are always Readn
+// whose Reads are always FullReads
 type fullRead struct {
        r       Read;
 }
 
 func (fr *fullRead) Read(p []byte) (n int, err os.Error) {
-       n, err = Readn(fr.r, p);
+       n, err = FullRead(fr.r, p);
        return n, err
 }
 
 // MakeFullReader takes r, an implementation of Read, and returns an object
-// that still implements Read but always calls Readn underneath.
+// that still implements Read but always calls FullRead underneath.
 func MakeFullReader(r Read) Read {
        if fr, ok := r.(*fullRead); ok {
                // already a fullRead

diff --git a/src/lib/net/dialgoogle_test.go b/src/lib/net/dialgoogle_test.go
index f3fdb9a1d285abc0a9a3db78131590abf507536b..690ba572d761fee444280c12b815d2d7a8482ad6 100644 (file)
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/lib/net/dialgoogle_test.go
@@ -23,7 +23,7 @@ func fetchGoogle(t *testing.T, fd net.Conn, network, addr string) {
        n, err := fd.Write(req);
 
        buf := make([]byte, 1000);
-       n, err = io.Readn(fd, buf);
+       n, err = io.FullRead(fd, buf);
 
        if n < 1000 {
                t.Errorf("fetchGoogle: short HTTP read from %s %s - %v", network, addr, err);

diff --git a/src/lib/net/parse.go b/src/lib/net/parse.go
index 72aeff072b9246046f5e4d1e6cdb8b0af9040735..78eff5f4711f1902b487abe16ceea6dd1ca69cc7 100644 (file)
--- a/src/lib/net/parse.go
+++ b/src/lib/net/parse.go
@@ -46,7 +46,7 @@ func (f *file) readLine() (s string, ok bool) {
        }
        if len(f.data) < cap(f.data) {
                ln := len(f.data);
-               n, err := io.Readn(f.file, f.data[ln:cap(f.data)]);
+               n, err := io.FullRead(f.file, f.data[ln:cap(f.data)]);
                if n >= 0 {
                        f.data = f.data[0:ln+n];
                }

diff --git a/src/lib/time/zoneinfo.go b/src/lib/time/zoneinfo.go
index cab38af34af64efc76c0e5a103d1b14f2f4abc50..124ae0df495582517ef0fb525342e28e471f0a4c 100644 (file)
--- a/src/lib/time/zoneinfo.go
+++ b/src/lib/time/zoneinfo.go
@@ -212,7 +212,7 @@ func readfile(name string, max int) (p []byte, err os.Error) {
                return nil, e;
        }
        p = make([]byte, max);
-       n, err1 := io.Readn(f, p);
+       n, err1 := io.FullRead(f, p);
        f.Close();
        if err1 == nil {        // too long
                return nil, TimeZoneError{ "time: zone file too long: " + name };

diff --git a/usr/gri/pretty/platform.go b/usr/gri/pretty/platform.go
index 25f7a7bba85e55e219945c929f6c0b9ecc054c97..cbd4678e331ea7008a0afdf92fc273168e878c1a 100644 (file)
--- a/usr/gri/pretty/platform.go
+++ b/usr/gri/pretty/platform.go
@@ -43,7 +43,7 @@ func readfile(filename string) ([]byte, OS.Error) {
                return []byte{}, err;
        }
        var buf [1<<20]byte;
-       n, err1 := IO.Readn(f, &buf);
+       n, err1 := IO.FullRead(f, &buf);
        f.Close();
        if err1 == IO.ErrEOF {
                err1 = nil;