Skip to content

Commit 9d64682

Browse files
committed
make dmn_ident a uint32_t instead of an int (match kevent)
1 parent f699213 commit 9d64682

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/event/event_epoll.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ typedef struct dispatch_muxnote_s {
4848
TAILQ_HEAD(, dispatch_unote_linkage_s) dmn_readers_head;
4949
TAILQ_HEAD(, dispatch_unote_linkage_s) dmn_writers_head;
5050
int dmn_fd;
51-
int dmn_ident;
51+
uint32_t dmn_ident;
5252
uint32_t dmn_events;
5353
int16_t dmn_filter;
5454
bool dmn_skip_outq_ioctl;
@@ -100,7 +100,7 @@ _dispatch_muxnote_find(struct dispatch_muxnote_bucket_s *dmb,
100100
dispatch_muxnote_t dmn;
101101
if (filter == EVFILT_WRITE) filter = EVFILT_READ;
102102
TAILQ_FOREACH(dmn, dmb, dmn_list) {
103-
if (dmn->dmn_ident == (int)ident && dmn->dmn_filter == filter) {
103+
if (dmn->dmn_ident == ident && dmn->dmn_filter == filter) {
104104
break;
105105
}
106106
}
@@ -112,7 +112,7 @@ _dispatch_muxnote_find(struct dispatch_muxnote_bucket_s *dmb,
112112
static void
113113
_dispatch_muxnote_dispose(dispatch_muxnote_t dmn)
114114
{
115-
if (dmn->dmn_filter != EVFILT_READ || dmn->dmn_fd != dmn->dmn_ident) {
115+
if (dmn->dmn_filter != EVFILT_READ || (uint32_t)dmn->dmn_fd != dmn->dmn_ident) {
116116
close(dmn->dmn_fd);
117117
}
118118
free(dmn);
@@ -196,7 +196,7 @@ _dispatch_muxnote_create(dispatch_unote_t du, uint32_t events)
196196
TAILQ_INIT(&dmn->dmn_readers_head);
197197
TAILQ_INIT(&dmn->dmn_writers_head);
198198
dmn->dmn_fd = fd;
199-
dmn->dmn_ident = (int)du._du->du_ident;
199+
dmn->dmn_ident = du._du->du_ident;
200200
dmn->dmn_filter = filter;
201201
dmn->dmn_events = events;
202202
dmn->dmn_skip_outq_ioctl = skip_outq_ioctl;
@@ -506,7 +506,7 @@ _dispatch_get_buffer_size(dispatch_muxnote_t dmn, bool writer)
506506
return 1;
507507
}
508508

509-
if (ioctl(dmn->dmn_ident, writer ? SIOCOUTQ : SIOCINQ, &n) != 0) {
509+
if (ioctl((int)dmn->dmn_ident, writer ? SIOCOUTQ : SIOCINQ, &n) != 0) {
510510
switch (errno) {
511511
case EINVAL:
512512
case ENOTTY:

0 commit comments

Comments
 (0)