diff options
| author | Russ Cox <rsc@golang.org> | 2008-12-18 22:37:22 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2008-12-18 22:37:22 -0800 |
| commit | d47d888ba663014e6aa8ca043e694f4b2a5898b8 (patch) | |
| tree | 851fad01a87b8fa071ed46fa0985f1857d9e47ca /src/lib/syscall | |
| parent | 9786f69f74a5fa290476774e07fb10ce8da84123 (diff) | |
| download | go-d47d888ba663014e6aa8ca043e694f4b2a5898b8.tar.xz | |
convert *[] to [].
R=r
OCL=21563
CL=21571
Diffstat (limited to 'src/lib/syscall')
| -rw-r--r-- | src/lib/syscall/file_darwin.go | 10 | ||||
| -rw-r--r-- | src/lib/syscall/socket_darwin.go | 6 | ||||
| -rw-r--r-- | src/lib/syscall/socket_linux.go | 2 | ||||
| -rw-r--r-- | src/lib/syscall/syscall.go | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/syscall/file_darwin.go b/src/lib/syscall/file_darwin.go index 55add2567a..7084a72a89 100644 --- a/src/lib/syscall/file_darwin.go +++ b/src/lib/syscall/file_darwin.go @@ -15,7 +15,7 @@ const NameBufsize = 512 export func open(name string, mode int64, perm int64) (ret int64, errno int64) { var namebuf [NameBufsize]byte; - if !StringToBytes(&namebuf, name) { + if !StringToBytes(namebuf, name) { return -1, ENAMETOOLONG } r1, r2, err := Syscall(SYS_OPEN, int64(uintptr(unsafe.pointer(&namebuf[0]))), mode, perm); @@ -24,7 +24,7 @@ export func open(name string, mode int64, perm int64) (ret int64, errno int64) { export func creat(name string, perm int64) (ret int64, errno int64) { var namebuf [NameBufsize]byte; - if !StringToBytes(&namebuf, name) { + if !StringToBytes(namebuf, name) { return -1, ENAMETOOLONG } r1, r2, err := Syscall(SYS_OPEN, int64(uintptr(unsafe.pointer(&namebuf[0]))), O_CREAT|O_WRONLY|O_TRUNC, perm); @@ -58,7 +58,7 @@ export func pipe(fds *[2]int64) (ret int64, errno int64) { export func stat(name string, buf *Stat) (ret int64, errno int64) { var namebuf [NameBufsize]byte; - if !StringToBytes(&namebuf, name) { + if !StringToBytes(namebuf, name) { return -1, ENAMETOOLONG } r1, r2, err := Syscall(SYS_STAT64, int64(uintptr(unsafe.pointer(&namebuf[0]))), int64(uintptr(unsafe.pointer(buf))), 0); @@ -77,7 +77,7 @@ export func fstat(fd int64, buf *Stat) (ret int64, errno int64) { export func unlink(name string) (ret int64, errno int64) { var namebuf [NameBufsize]byte; - if !StringToBytes(&namebuf, name) { + if !StringToBytes(namebuf, name) { return -1, ENAMETOOLONG } r1, r2, err := Syscall(SYS_UNLINK, int64(uintptr(unsafe.pointer(&namebuf[0]))), 0, 0); @@ -91,7 +91,7 @@ export func fcntl(fd, cmd, arg int64) (ret int64, errno int64) { export func mkdir(name string, perm int64) (ret int64, errno int64) { var namebuf [NameBufsize]byte; - if !StringToBytes(&namebuf, name) { + if !StringToBytes(namebuf, name) { return -1, ENAMETOOLONG } r1, r2, err := Syscall(SYS_MKDIR, int64(uintptr(unsafe.pointer(&namebuf[0]))), perm, 0); diff --git a/src/lib/syscall/socket_darwin.go b/src/lib/syscall/socket_darwin.go index eb9f72c55b..e83004bdcb 100644 --- a/src/lib/syscall/socket_darwin.go +++ b/src/lib/syscall/socket_darwin.go @@ -91,17 +91,17 @@ export func kqueue() (ret int64, errno int64) { return r1, err } -export func kevent(kq int64, changes, events *[]Kevent, timeout *Timespec) (ret int64, errno int64) { +export func kevent(kq int64, changes, events []Kevent, timeout *Timespec) (ret int64, errno int64) { var nchange, changeptr, nevent, eventptr int64; nchange = 0; changeptr = 0; nevent = 0; eventptr = 0; - if changes != nil && len(changes) > 0 { + if len(changes) > 0 { changeptr = int64(uintptr(unsafe.pointer(&changes[0]))); nchange = int64(len(changes)) } - if events != nil && len(events) > 0 { + if len(events) > 0 { eventptr = int64(uintptr(unsafe.pointer(&events[0]))); nevent = int64(len(events)) } diff --git a/src/lib/syscall/socket_linux.go b/src/lib/syscall/socket_linux.go index 614c6bcb24..05df6baafe 100644 --- a/src/lib/syscall/socket_linux.go +++ b/src/lib/syscall/socket_linux.go @@ -108,7 +108,7 @@ export func epoll_ctl(epfd, op, fd int64, ev *EpollEvent) int64 { return err } -export func epoll_wait(epfd int64, ev *[]EpollEvent, msec int64) (ret int64, err int64) { +export func epoll_wait(epfd int64, ev []EpollEvent, msec int64) (ret int64, err int64) { var evptr, nev int64; if ev != nil && len(ev) > 0 { nev = int64(len(ev)); diff --git a/src/lib/syscall/syscall.go b/src/lib/syscall/syscall.go index 79fc13ad99..9cef40d252 100644 --- a/src/lib/syscall/syscall.go +++ b/src/lib/syscall/syscall.go @@ -16,7 +16,7 @@ export func RawSyscall(trap int64, a1, a2, a3 int64) (r1, r2, err int64); * Used to convert file names to byte arrays for passing to kernel, * but useful elsewhere too. */ -export func StringToBytes(b *[]byte, s string) bool { +export func StringToBytes(b []byte, s string) bool { if len(s) >= len(b) { return false } |
