summaryrefslogtreecommitdiff
path: root/libgo/go/os/dir.go
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-12-03 02:17:34 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-12-03 02:17:34 +0000
commit6692ad1d1b2710fc619d04aad2ae0668cc59f4db (patch)
tree7f76eff391f37fe6467ff4ffbc0c582c9959ea30 /libgo/go/os/dir.go
parent96265ae6967d08ca35d36e87b7588c0c9e6e5cca (diff)
downloadgcc-6692ad1d1b2710fc619d04aad2ae0668cc59f4db.tar.gz
libgo: Update to weekly.2011-11-02.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181964 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/os/dir.go')
-rw-r--r--libgo/go/os/dir.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/go/os/dir.go b/libgo/go/os/dir.go
index 5f383c12fda..1e578e85e1a 100644
--- a/libgo/go/os/dir.go
+++ b/libgo/go/os/dir.go
@@ -5,6 +5,7 @@
package os
import (
+ "io"
"syscall"
"unsafe"
)
@@ -39,7 +40,7 @@ var elen int;
// nil os.Error. If it encounters an error before the end of the
// directory, Readdirnames returns the names read until that point and
// a non-nil error.
-func (file *File) Readdirnames(n int) (names []string, err Error) {
+func (file *File) Readdirnames(n int) (names []string, err error) {
if elen == 0 {
var dummy syscall.Dirent;
elen = (unsafe.Offsetof(dummy.Name) +
@@ -85,7 +86,7 @@ func (file *File) Readdirnames(n int) (names []string, err Error) {
n--
}
if n >= 0 && len(names) == 0 {
- return names, EOF
+ return names, io.EOF
}
return names, nil
}