| Index: src/pkg/syscall/zsyscall_plan9_386.go |
| =================================================================== |
| --- a/src/pkg/syscall/zsyscall_plan9_386.go |
| +++ b/src/pkg/syscall/zsyscall_plan9_386.go |
| @@ -22,9 +22,8 @@ |
| _p0 = unsafe.Pointer(&_zero) |
| } |
| r0, _, e1 := Syscall(SYS_FD2PATH, uintptr(fd), uintptr(_p0), uintptr(len(buf))) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -33,20 +32,8 @@ |
| func pipe(p *[2]_C_int) (err error) { |
| r0, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| - } |
| - return |
| -} |
| - |
| -// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT |
| - |
| -func sleep(millisecs int32) (err error) { |
| - r0, _, e1 := Syscall(SYS_SLEEP, uintptr(millisecs), 0, 0) |
| - err = nil |
| - if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -62,9 +49,8 @@ |
| } |
| r0, _, e1 := Syscall(SYS_AWAIT, uintptr(_p0), uintptr(len(s)), 0) |
| n = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -74,9 +60,8 @@ |
| func Dup(oldfd int, newfd int) (fd int, err error) { |
| r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), uintptr(newfd), 0) |
| fd = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -86,9 +71,8 @@ |
| func Open(path string, mode int) (fd int, err error) { |
| r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), 0) |
| fd = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -98,9 +82,8 @@ |
| func Create(path string, mode int, perm uint32) (fd int, err error) { |
| r0, _, e1 := Syscall(SYS_CREATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(mode), uintptr(perm)) |
| fd = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -109,9 +92,8 @@ |
| func Remove(path string) (err error) { |
| r0, _, e1 := Syscall(SYS_REMOVE, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -127,9 +109,8 @@ |
| } |
| r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0) |
| n = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -145,9 +126,8 @@ |
| } |
| r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0) |
| n = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -156,9 +136,8 @@ |
| func Close(fd int) (err error) { |
| r0, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -167,9 +146,8 @@ |
| func Chdir(path string) (err error) { |
| r0, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(StringBytePtr(path))), 0, 0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -178,9 +156,8 @@ |
| func Bind(name string, old string, flag int) (err error) { |
| r0, _, e1 := Syscall(SYS_BIND, uintptr(unsafe.Pointer(StringBytePtr(name))), uintptr(unsafe.Pointer(StringBytePtr(old))), uintptr(flag)) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -189,9 +166,8 @@ |
| func Mount(fd int, afd int, old string, flag int, aname string) (err error) { |
| r0, _, e1 := Syscall6(SYS_MOUNT, uintptr(fd), uintptr(afd), uintptr(unsafe.Pointer(StringBytePtr(old))), uintptr(flag), uintptr(unsafe.Pointer(StringBytePtr(aname))), 0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -207,9 +183,8 @@ |
| } |
| r0, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(_p0), uintptr(len(edir))) |
| n = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -225,9 +200,8 @@ |
| } |
| r0, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir))) |
| n = int(r0) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -242,9 +216,8 @@ |
| _p0 = unsafe.Pointer(&_zero) |
| } |
| r0, _, e1 := Syscall(SYS_WSTAT, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(_p0), uintptr(len(edir))) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
| @@ -259,9 +232,8 @@ |
| _p0 = unsafe.Pointer(&_zero) |
| } |
| r0, _, e1 := Syscall(SYS_FWSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir))) |
| - err = nil |
| if int(r0) == -1 { |
| - err = NewError(e1) |
| + err = e1 |
| } |
| return |
| } |
