From: Nathan Youngman <git@nathany.com>
Date: Wed, 24 Sep 2014 18:56:27 +0000 (-0600)
Subject: kqueue: remove calls to os.NewSyscallError
X-Git-Tag: v1.7.2~256
X-Git-Url: https://go.fuhry.dev/?a=commitdiff_plain;h=719fef588d53f4ccdf94803732cc34a6097ce1b7;p=fsnotify.git

kqueue: remove calls to os.NewSyscallError

calling os.NewSyscallError would silently break comparisons with the syscall constants. it didn't really add much value either, besides the "Kevent" prefix.

http://play.golang.org/p/YKbmygNDu4
---

diff --git a/kqueue.go b/kqueue.go
index 4f37b49..3444652 100644
--- a/kqueue.go
+++ b/kqueue.go
@@ -197,7 +197,7 @@ func (w *Watcher) addWatch(name string, flags uint32) error {
 
 		watchfd, err = syscall.Open(name, openMode, 0700)
 		if watchfd == -1 {
-			return os.NewSyscallError("Open", err)
+			return err
 		}
 
 		isDir = fi.IsDir()
@@ -246,7 +246,7 @@ func (w *Watcher) readEvents() {
 		case <-w.done:
 			err := syscall.Close(w.kq)
 			if err != nil {
-				w.Errors <- os.NewSyscallError("close", err)
+				w.Errors <- err
 			}
 			close(w.Events)
 			close(w.Errors)
@@ -258,7 +258,7 @@ func (w *Watcher) readEvents() {
 		kevents, err := read(w.kq, eventBuffer, &keventWaitTime)
 		// EINTR is okay, the syscall was interrupted before timeout expired.
 		if err != nil && err != syscall.EINTR {
-			w.Errors <- os.NewSyscallError("Kevent", err)
+			w.Errors <- err
 			continue
 		}
 
@@ -419,7 +419,7 @@ func (w *Watcher) internalWatch(name string, fileInfo os.FileInfo) error {
 func kqueue() (kq int, err error) {
 	kq, err = syscall.Kqueue()
 	if kq == -1 {
-		return kq, os.NewSyscallError("Kqueue", err)
+		return kq, err
 	}
 	return kq, nil
 }
@@ -437,7 +437,7 @@ func register(kq int, fds []int, flags int, fflags uint32) error {
 	// register the events
 	success, err := syscall.Kevent(kq, changes, nil, nil)
 	if success == -1 {
-		return os.NewSyscallError("Kevent", err)
+		return err
 	}
 	return nil
 }