Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-10-27 23:04:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Automated g4 rollback of changelist 25024,

Browse source 
plus significant hand editing.

Back to T{x} for composite literals.

R=r
OCL=25612
CL=25632
This commit is contained in:
Russ Cox 2009-03-03 08:39:12 -08:00
parent e8b43190bb
commit be2edb5761
100 changed files with 1711 additions and 1710 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/os/dir_amd64_linux.go
View file

@ -42,7 +42,7 @@ func Readdirnames(fd *FD, count int) (names []string, err *os.Error) {
// Refill the buffer if necessary
if d.bufp == d.nbuf {
var errno int64;
dbuf := unsafe.Pointer(&d.buf[0]).(*syscall.Dirent);
dbuf := (*syscall.Dirent)(unsafe.Pointer(&d.buf[0]));
d.nbuf, errno = syscall.Getdents(fd.fd, dbuf, int64(len(d.buf)));
if d.nbuf < 0 {
return names, os.ErrnoToError(errno)
@ -54,7 +54,7 @@ func Readdirnames(fd *FD, count int) (names []string, err *os.Error) {
}
// Drain the buffer
for count != 0 && d.bufp < d.nbuf {
dirent := unsafe.Pointer(&d.buf[d.bufp]).(*syscall.Dirent);
dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp]));
d.bufp += int64(dirent.Reclen);
if dirent.Ino == 0 { // File absent in directory.
continue