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 c2528a5..906955e 100644
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/pkg/syscall/syscall_freebsd.go
@@ -454,10 +454,6 @@
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 @@
//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 f493738..9e165086 100644
--- a/src/pkg/syscall/zsyscall_freebsd_386.go
+++ b/src/pkg/syscall/zsyscall_freebsd_386.go
@@ -370,8 +370,8 @@
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 b85ef82..f6d42bc 100644
--- a/src/pkg/syscall/zsyscall_freebsd_amd64.go
+++ b/src/pkg/syscall/zsyscall_freebsd_amd64.go
@@ -370,8 +370,8 @@
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
}
