From 6305fe2580781df44e93c1ec8ed380896680960d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 21 Jul 2018 16:42:59 +0000 Subject: Adapt to skalibs-2.7.0.0 --- src/libs6/ftrigw_notifyb_nosig.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/libs6/ftrigw_notifyb_nosig.c') diff --git a/src/libs6/ftrigw_notifyb_nosig.c b/src/libs6/ftrigw_notifyb_nosig.c index 0ba38a6..38110f2 100644 --- a/src/libs6/ftrigw_notifyb_nosig.c +++ b/src/libs6/ftrigw_notifyb_nosig.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -32,14 +33,14 @@ int ftrigw_notifyb_nosig (char const *path, char const *s, size_t len) fd = open_write(tmp) ; if (fd == -1) { - if (errno == ENXIO) unlink(tmp) ; + if (errno == ENXIO) unlink_void(tmp) ; } else { ssize_t r = fd_write(fd, s, len) ; if ((r < 0) || (size_t)r < len) { - if (errno == EPIPE) unlink(tmp) ; + if (errno == EPIPE) unlink_void(tmp) ; /* what to do if EGAIN ? full fifo -> fix the reader ! There's a race condition in extreme cases though ; but it's still better to be nonblocking - the writer @@ -54,9 +55,6 @@ int ftrigw_notifyb_nosig (char const *path, char const *s, size_t len) } } } - { - int e = errno ; - dir_close(dir) ; - return e ? (errno = e, -1) : (int)i ; - } + dir_close(dir) ; + return errno ? -1 : (int)i ; } -- cgit v1.2.3