change DirInfo->dirInfo now that 6g export bug is fixed

R=rsc
DELTA=4  (0 added, 0 deleted, 4 changed)
OCL=24788
CL=24805

diff --git a/src/lib/os/dir_amd64_darwin.go b/src/lib/os/dir_amd64_darwin.go
index 04d3a90c6f8e1a18e2455cd79bd3d4fb5dd061dc..2821076dc6833515ca8685669b2b746a27992d40 100644 (file)
--- a/src/lib/os/dir_amd64_darwin.go
+++ b/src/lib/os/dir_amd64_darwin.go
@@ -18,7 +18,7 @@ const (
 func Readdirnames(fd *FD, count int) (names []string, err *os.Error) {
        // If this fd has no dirinfo, create one.
        if fd.dirinfo == nil {
-               fd.dirinfo = new(DirInfo);
+               fd.dirinfo = new(dirInfo);
                // The buffer must be at least a block long.
                // TODO(r): use fstatfs to find fs block size.
                fd.dirinfo.buf = make([]byte, blockSize);

diff --git a/src/lib/os/dir_amd64_linux.go b/src/lib/os/dir_amd64_linux.go
index a5b8a7ba2e1a68477ce8bc06b7b26a45c6583304..f73febc4c709d551a80561b877a26a55a1bdab47 100644 (file)
--- a/src/lib/os/dir_amd64_linux.go
+++ b/src/lib/os/dir_amd64_linux.go
@@ -27,7 +27,7 @@ func clen(n []byte) int {
 func Readdirnames(fd *FD, count int) (names []string, err *os.Error) {
        // If this fd has no dirinfo, create one.
        if fd.dirinfo == nil {
-               fd.dirinfo = new(DirInfo);
+               fd.dirinfo = new(dirInfo);
                // The buffer must be at least a block long.
                // TODO(r): use fstatfs to find fs block size.
                fd.dirinfo.buf = make([]byte, blockSize);

diff --git a/src/lib/os/file.go b/src/lib/os/file.go
index 2a4bc6723d7631626c81442e8a439d5de6a29092..a0fc4bb6793f65ff64dd17d8dea75a3e1dbca1b2 100644 (file)
--- a/src/lib/os/file.go
+++ b/src/lib/os/file.go
@@ -8,7 +8,7 @@ import syscall "syscall"
 import os "os"
 
 // Auxiliary information if the FD describes a directory
-type DirInfo struct {  // TODO(r): 6g bug means this can't be private
+type dirInfo struct {  // TODO(r): 6g bug means this can't be private
        buf     []byte; // buffer for directory I/O
        nbuf    int64;  // length of buf; return value from Getdirentries
        bufp    int64;  // location of next record in buf.
@@ -18,7 +18,7 @@ type DirInfo struct { // TODO(r): 6g bug means this can't be private
 type FD struct {
        fd int64;
        name    string;
-       dirinfo *DirInfo;       // nil unless directory being read
+       dirinfo *dirInfo;       // nil unless directory being read
 }
 
 func (fd *FD) Fd() int64 {