albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove fd from io_event structure

This commit is contained in:
Florian Westphal 2006-07-12 19:27:12 +00:00
parent 161340d486
commit 3833f8aae3
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ngircd/io.c
View File

@ -12,7 +12,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: io.c,v 1.14 2006/05/10 17:33:36 fw Exp $"; static char UNUSED id[] = "$Id: io.c,v 1.15 2006/07/12 19:27:12 fw Exp $";
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
@ -31,7 +31,6 @@ static char UNUSED id[] = "$Id: io.c,v 1.14 2006/05/10 17:33:36 fw Exp $";
typedef struct { typedef struct {
void (*callback)(int, short); void (*callback)(int, short);
int fd;
short what; short what;
} io_event; } io_event;
@ -220,7 +219,6 @@ io_event_create(int fd, short what, void (*cbfunc) (int, short))
return false; return false;
} }
i->fd = fd;
i->callback = cbfunc; i->callback = cbfunc;
i->what = 0; i->what = 0;
#ifdef IO_USE_EPOLL #ifdef IO_USE_EPOLL
@ -370,7 +368,7 @@ io_close(int fd)
while (select_maxfd>0) { while (select_maxfd>0) {
--select_maxfd; /* find largest fd */ --select_maxfd; /* find largest fd */
i = io_event_get(select_maxfd); i = io_event_get(select_maxfd);
if (i && (i->fd >= 0)) break; if (i && i->callback) break;
} }
} }
#endif #endif
@ -391,8 +389,8 @@ io_close(int fd)
io_event_change_epoll(fd, 0, EPOLL_CTL_DEL); io_event_change_epoll(fd, 0, EPOLL_CTL_DEL);
#endif #endif
if (i) { if (i) {
memset(i, 0, sizeof(io_event)); i->callback = NULL;
i->fd = -1; i->what = 0;
} }
return close(fd) == 0; return close(fd) == 0;
} }
@ -418,10 +416,10 @@ io_event_del(int fd, short what)
#endif #endif
#ifdef IO_USE_SELECT #ifdef IO_USE_SELECT
if (what & IO_WANTWRITE) if (what & IO_WANTWRITE)
FD_CLR(i->fd, &writers); FD_CLR(fd, &writers);
if (what & IO_WANTREAD) if (what & IO_WANTREAD)
FD_CLR(i->fd, &readers); FD_CLR(fd, &readers);
return true; return true;
#endif #endif