projects
/
oweals
/
libubox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f24b629
)
uloop: remove file descriptors if neither read nor write notification is requested
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 31 Jan 2013 15:43:00 +0000
(16:43 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Thu, 31 Jan 2013 15:43:08 +0000
(16:43 +0100)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
uloop.c
patch
|
blob
|
history
diff --git
a/uloop.c
b/uloop.c
index a3ba3ad550c6a8c7383b7e167c697e2fd5a08835..f0ccb0c2e6344400853bd8548355328f19feb06f 100644
(file)
--- a/
uloop.c
+++ b/
uloop.c
@@
-246,6
+246,9
@@
int uloop_fd_delete(struct uloop_fd *sock)
{
int i;
+ if (!sock->registered)
+ return 0;
+
for (i = cur_fd + 1; i < cur_nfds; i++) {
if (events[i].data.ptr != sock)
continue;
@@
-302,6
+305,9
@@
int uloop_fd_add(struct uloop_fd *sock, unsigned int flags)
unsigned int fl;
int ret;
+ if (!(flags & (ULOOP_READ | ULOOP_WRITE)))
+ return uloop_fd_delete(sock);
+
if (!sock->registered && !(flags & ULOOP_BLOCKING)) {
fl = fcntl(sock->fd, F_GETFL, 0);
fl |= O_NONBLOCK;