oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

notify: cleanups

Browse Source 
* move set_nonblock{,ing}() into utils.c since we use it
elsewhere, too
* add proper error checking to set_nonblocking()
* use os_compat.h instead of individually #includ-ing system headers

git-svn-id: https://svn.musicpd.org/mpd/trunk@7217 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2008-03-26 10:39:03 +00:00
parent 70dbc2b0e7
commit 232c9f6c41
7 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/notify.c
View File

@@ -17,40 +17,17 @@
*/
#include "notify.h"
#include "os_compat.h"
#include "log.h"
#include "utils.h"
#include <assert.h>
#include <fcntl.h>
#include <unistd.h>
int set_nonblock(int fd)
void initNotify(Notify *notify)
{
int ret;
assert(fd >= 0);
ret = fcntl(fd, F_GETFL, 0);
if (ret < 0)
return ret;
return fcntl(fd, F_SETFL, ret|O_NONBLOCK);
}
int initNotify(Notify *notify)
{
int ret;
ret = pipe(notify->fds);
if (ret < 0)
return -1;
ret = set_nonblock(notify->fds[1]);
if (ret < 0) {
close(notify->fds[0]);
close(notify->fds[1]);
return -1;
}
return 0;
if (pipe(notify->fds) < 0)
FATAL("Couldn't open pipe: %s", strerror(errno));
if (set_nonblocking(notify->fds[1]) < 0)
FATAL("Couldn't set non-blocking on notify fd: %s",
strerror(errno));
}
int waitNotify(Notify *notify)