FreeBSD: Kill only takes pid & signal

Cosmetic fix.  The FreeBSD system call only takes two
arguments.

http://fxr.watson.org/fxr/source/kern/kern_sig.c?im=bigexcerpts#L1678

R=dho, rsc
CC=golang-dev
https://golang.org/cl/202051

diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/pkg/syscall/syscall_freebsd.go
index c2528a520d953edf52f4c544194138490e6edbb2..906955e9794e513caba71b549095276edd4352a5 100644 (file)
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/pkg/syscall/syscall_freebsd.go
@@ -454,10 +454,6 @@ 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!
@@ -515,6 +511,7 @@ func Kill(pid int, signum int) (errno int) { return kill(pid, signum, 1) }
 //sys  Gettimeofday(tv *Timeval) (errno int)
 //sys  Getuid() (uid int)
 //sys  Issetugid() (tainted bool)
+//sys  Kill(pid int, signum 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_freebsd_386.go b/src/pkg/syscall/zsyscall_freebsd_386.go
index f493738290bbf55cdab9caece720d87f1e1c23f3..9e165086a450b7bbacb22546a213620a626da361 100644 (file)
--- a/src/pkg/syscall/zsyscall_freebsd_386.go
+++ b/src/pkg/syscall/zsyscall_freebsd_386.go
@@ -370,8 +370,8 @@ func Issetugid() (tainted bool) {
        return
 }
 
-func kill(pid int, signum int, posix int) (errno int) {
-       _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
+func Kill(pid int, signum int) (errno int) {
+       _, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
        errno = int(e1)
        return
 }

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