From 96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0 Mon Sep 17 00:00:00 2001 From: Nathan Youngman Date: Sun, 8 Feb 2015 13:29:58 -0700 Subject: [PATCH] v1.2.0 closes #66 (apply mail) --- CHANGELOG.md | 3 ++- inotify_poller.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07d50a8..ea9428a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog -## master / 2015-02-07 +## v1.2.0 / 2015-02-08 +* inotify: use epoll to wake up readEvents [#66](https://github.com/go-fsnotify/fsnotify/pull/66) (thanks @PieterD) * inotify: closing watcher should now always shut down goroutine [#63](https://github.com/go-fsnotify/fsnotify/pull/63) (thanks @PieterD) * kqueue: close kqueue after removing watches, fixes [#59](https://github.com/go-fsnotify/fsnotify/issues/59) diff --git a/inotify_poller.go b/inotify_poller.go index 029c199..3b41784 100644 --- a/inotify_poller.go +++ b/inotify_poller.go @@ -28,7 +28,8 @@ func emptyPoller(fd int) *fdPoller { // Create a new inotify poller. // This creates an inotify handler, and an epoll handler. -func newFdPoller(fd int) (_ *fdPoller, errno error) { +func newFdPoller(fd int) (*fdPoller, error) { + var errno error poller := emptyPoller(fd) defer func() { if errno != nil { -- 2.50.1