aboutsummaryrefslogtreecommitdiff
path: root/src/lib/time
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-03-11 12:51:10 -0700
committerRuss Cox <rsc@golang.org>2009-03-11 12:51:10 -0700
commit7a706fb3d7642e782f60d3d1d137b3c220643b46 (patch)
tree6700308658c711a896e1c4a352a5ad41e706b304 /src/lib/time
parent6479d89378a17d009a52888db97c15e056ff57a3 (diff)
downloadgo-7a706fb3d7642e782f60d3d1d137b3c220643b46.tar.xz
Rename os.FD to os.File.
Make Fstat, Readdirnames, and Readdir methods on os.File. R=r DELTA=281 (79 added, 3 deleted, 199 changed) OCL=25891 CL=26130
Diffstat (limited to 'src/lib/time')
-rw-r--r--src/lib/time/zoneinfo.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/time/zoneinfo.go b/src/lib/time/zoneinfo.go
index 62f86499e5..8790f0ecd1 100644
--- a/src/lib/time/zoneinfo.go
+++ b/src/lib/time/zoneinfo.go
@@ -204,13 +204,13 @@ func parseinfo(bytes []byte) (zt []zonetime, err *os.Error) {
}
func readfile(name string, max int) (p []byte, err *os.Error) {
- fd, e := os.Open(name, os.O_RDONLY, 0);
+ f, e := os.Open(name, os.O_RDONLY, 0);
if e != nil {
return nil, e;
}
p = make([]byte, max);
- n, err1 := io.Readn(fd, p);
- fd.Close();
+ n, err1 := io.Readn(f, p);
+ f.Close();
if err1 == nil { // too long
return nil, badZoneinfo;
}