From 9dbaa991819fde8a0afed727506290ee993d2eef Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 19 Dec 2016 02:06:19 -0500
Subject: Use x/sys/unix instead of the deprecated syscall.

---
 inotify/syscall.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'inotify/syscall.go')

diff --git a/inotify/syscall.go b/inotify/syscall.go
index 33a10e2..a6f203f 100644
--- a/inotify/syscall.go
+++ b/inotify/syscall.go
@@ -18,7 +18,8 @@ package inotify
 
 import (
 	"os"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 func newPathError(op string, path string, err error) error {
@@ -30,26 +31,26 @@ func newPathError(op string, path string, err error) error {
 
 // Create and initialize inotify instance.
 func sys_inotify_init() (inFd, error) {
-	fd, err := syscall.InotifyInit()
+	fd, err := unix.InotifyInit()
 	return inFd(fd), os.NewSyscallError("inotify_init", err)
 }
 
 // Create and initialize inotify instance.
 func sys_inotify_init1(flags int) (inFd, error) {
-	fd, err := syscall.InotifyInit1(flags)
+	fd, err := unix.InotifyInit1(flags)
 	return inFd(fd), os.NewSyscallError("inotify_init1", err)
 }
 
 // Add watch of object NAME to inotify instance FD.  Notify about
 // events specified by MASK.
 func sys_inotify_add_watch(fd inFd, name string, mask Mask) (Wd, error) {
-	wd, err := syscall.InotifyAddWatch(int(fd), name, uint32(mask))
+	wd, err := unix.InotifyAddWatch(int(fd), name, uint32(mask))
 	return Wd(wd), newPathError("inotify_add_watch", name, err)
 }
 
 // Remove the watch specified by WD from the inotify instance FD.
 func sys_inotify_rm_watch(fd inFd, wd Wd) error {
-	success, err := syscall.InotifyRmWatch(int(fd), uint32(wd))
+	success, err := unix.InotifyRmWatch(int(fd), uint32(wd))
 	switch success {
 	case -1:
 		if err == nil {
@@ -66,16 +67,16 @@ func sys_inotify_rm_watch(fd inFd, wd Wd) error {
 }
 
 func sys_close(fd inFd) error {
-	return os.NewSyscallError("close", syscall.Close(int(fd)))
+	return os.NewSyscallError("close", unix.Close(int(fd)))
 }
 
 func sys_read(fd inFd, p []byte) (int, error) {
-	n, err := syscall.Read(int(fd), p)
+	n, err := unix.Read(int(fd), p)
 	return n, os.NewSyscallError("read", err)
 }
 
 func sys_dupfd_cloexec(fd inFd) (inFd, error) {
-	n, _, errno := syscall.Syscall(syscall.SYS_FCNTL, uintptr(fd), syscall.F_DUPFD_CLOEXEC, 0)
+	n, _, errno := unix.Syscall(unix.SYS_FCNTL, uintptr(fd), unix.F_DUPFD_CLOEXEC, 0)
 	if errno != 0 {
 		return -1, os.NewSyscallError("dupfd_cloexec", errno)
 	}
@@ -83,14 +84,14 @@ func sys_dupfd_cloexec(fd inFd) (inFd, error) {
 }
 
 func sys_setnonblock(fd inFd, nonblocking bool) error {
-	err := syscall.SetNonblock(int(fd), nonblocking)
+	err := unix.SetNonblock(int(fd), nonblocking)
 	return os.NewSyscallError("setnonblock", err)
 }
 
 func sys_getnonblock(fd inFd) (bool, error) {
-	flag, _, errno := syscall.Syscall(syscall.SYS_FCNTL, uintptr(fd), syscall.F_GETFL, 0)
+	flag, _, errno := unix.Syscall(unix.SYS_FCNTL, uintptr(fd), unix.F_GETFL, 0)
 	if errno != 0 {
 		return false, os.NewSyscallError("getnonblock", errno)
 	}
-	return flag & syscall.O_NONBLOCK != 0, nil
+	return flag&unix.O_NONBLOCK != 0, nil
 }
-- 
cgit v1.2.3