syscall: on freebsd, darwin, give Kill same signature as on linux

R=r, cw
CC=golang-dev
https://golang.org/cl/201043

diff --git a/src/pkg/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index 20f9fa24e4ca5a66214b7dd7f52b802b35cb7c75..1946ecd78ca11e0fe9c269e99c221489c32b1850 100644 (file)
--- a/src/pkg/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
@@ -454,6 +454,10 @@ func SysctlUint32(name string) (value uint32, errno int) {
        return *(*uint32)(unsafe.Pointer(&buf[0])), 0
 }
 
+//sys  kill(pid int, signum int, posix int) (errno int)
+
+func Kill(pid int, signum int) (errno int) { return kill(pid, signum, 1) }
+
 // TODO: wrap
 //     Acct(name nil-string) (errno int)
 //     Futimes(fd int, timeval *Timeval) (errno int)   // Pointer to 2 timevals!
@@ -511,7 +515,6 @@ func SysctlUint32(name string) (value uint32, errno int) {
 //sys  Getsid(pid int) (sid int, errno int)
 //sys  Getuid() (uid int)
 //sys  Issetugid() (tainted bool)
-//sys  Kill(pid int, signum int, posix int) (errno int)
 //sys  Kqueue() (fd int, errno int)
 //sys  Lchown(path string, uid int, gid int) (errno int)
 //sys  Link(path string, link string) (errno int)

diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/pkg/syscall/syscall_freebsd.go
index 4a187dd89de4221da97d3c105fd1d5a9e3079b07..c2528a520d953edf52f4c544194138490e6edbb2 100644 (file)
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/pkg/syscall/syscall_freebsd.go
@@ -454,6 +454,10 @@ func SysctlUint32(name string) (value uint32, errno int) {
        return *(*uint32)(unsafe.Pointer(&buf[0])), 0
 }
 
+//sys  kill(pid int, signum int, posix int) (errno int)
+
+func Kill(pid int, signum int) (errno int) { return kill(pid, signum, 1) }
+
 // TODO: wrap
 //     Acct(name nil-string) (errno int)
 //     Futimes(fd int, timeval *Timeval) (errno int)   // Pointer to 2 timevals!
@@ -511,7 +515,6 @@ func SysctlUint32(name string) (value uint32, errno int) {
 //sys  Gettimeofday(tv *Timeval) (errno int)
 //sys  Getuid() (uid int)
 //sys  Issetugid() (tainted bool)
-//sys  Kill(pid int, signum int, posix int) (errno int)
 //sys  Kqueue() (fd int, errno int)
 //sys  Lchown(path string, uid int, gid int) (errno int)
 //sys  Link(path string, link string) (errno int)

diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index 303919ce45a225fcea563ea5f9e147b6ce9a7ad3..6442f078b3bd02202dbfcc210269607fb909b285 100644 (file)
--- a/src/pkg/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
@@ -370,7 +370,7 @@ func Issetugid() (tainted bool) {
        return
 }
 
-func Kill(pid int, signum int, posix int) (errno int) {
+func kill(pid int, signum int, posix int) (errno int) {
        _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
        errno = int(e1)
        return

diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index 6e25cf3813ff2a551ce44950e217d79111134b48..5f4f9ee1d2409d0ea09a046fef4fd86b5135d72c 100644 (file)
--- a/src/pkg/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
@@ -370,7 +370,7 @@ func Issetugid() (tainted bool) {
        return
 }
 
-func Kill(pid int, signum int, posix int) (errno int) {
+func kill(pid int, signum int, posix int) (errno int) {
        _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
        errno = int(e1)
        return

diff --git a/src/pkg/syscall/zsyscall_freebsd_386.go b/src/pkg/syscall/zsyscall_freebsd_386.go
index 8216dc760036faf7e7e0204b2f09280dc4d1bcf1..f493738290bbf55cdab9caece720d87f1e1c23f3 100644 (file)
--- a/src/pkg/syscall/zsyscall_freebsd_386.go
+++ b/src/pkg/syscall/zsyscall_freebsd_386.go
@@ -370,7 +370,7 @@ func Issetugid() (tainted bool) {
        return
 }
 
-func Kill(pid int, signum int, posix int) (errno int) {
+func kill(pid int, signum int, posix int) (errno int) {
        _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
        errno = int(e1)
        return

diff --git a/src/pkg/syscall/zsyscall_freebsd_amd64.go b/src/pkg/syscall/zsyscall_freebsd_amd64.go
index ccae89b3bc0f6f816197cce4790dd2e1e83829a9..b85ef8223b2e066b1959418530155db194059d47 100644 (file)
--- a/src/pkg/syscall/zsyscall_freebsd_amd64.go
+++ b/src/pkg/syscall/zsyscall_freebsd_amd64.go
@@ -370,7 +370,7 @@ func Issetugid() (tainted bool) {
        return
 }
 
-func Kill(pid int, signum int, posix int) (errno int) {
+func kill(pid int, signum int, posix int) (errno int) {
        _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
        errno = int(e1)
        return