[dovecot-cvs] dovecot/src/lib ioloop-kqueue.c, 1.6, 1.7 ioloop-notify-kqueue.c, 1.4, 1.5

cras at dovecot.org cras at dovecot.org
Wed Aug 16 20:58:05 EEST 2006


Update of /var/lib/cvs/dovecot/src/lib
In directory talvi:/tmp/cvs-serv9675

Modified Files:
	ioloop-kqueue.c ioloop-notify-kqueue.c 
Log Message:
Compiling fixes


Index: ioloop-kqueue.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/ioloop-kqueue.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ioloop-kqueue.c	16 Aug 2006 15:54:58 -0000	1.6
+++ ioloop-kqueue.c	16 Aug 2006 17:58:02 -0000	1.7
@@ -104,7 +104,7 @@
 
 	first = ioloop_iolist_add(*list, io);
 
-	EV_SET(ev, io->fd, io_filter(io), EV_ADD, 0, 0, *list);
+	EV_SET(&ev, io->fd, io_filter(io), EV_ADD, 0, 0, *list);
 	if (kevent(ctx->kq, &ev, 1, NULL, 0, NULL) < 0)
 		i_fatal("kevent(EV_ADD, %d) failed: %m", io->fd);
 
@@ -130,7 +130,7 @@
 	last = ioloop_iolist_del(*list, io);
 
 	filter = io_filter(io) & ~io_list_filter(*list);
-	EV_SET(ev, io->fd, filter, EV_DELETE, 0, 0, *list);
+	EV_SET(&ev, io->fd, filter, EV_DELETE, 0, 0, *list);
 	if (kevent(ctx->kq, &ev, 1, NULL, 0, NULL) < 0)
 		i_error("kevent(EV_DELETE, %d) failed: %m", io->fd);
 

Index: ioloop-notify-kqueue.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib/ioloop-notify-kqueue.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ioloop-notify-kqueue.c	16 Aug 2006 15:54:58 -0000	1.4
+++ ioloop-notify-kqueue.c	16 Aug 2006 17:58:02 -0000	1.5
@@ -34,6 +34,7 @@
 	struct io *io;
 	struct kevent ev;
 	struct timespec ts;
+	int ret;
 
 	if (gettimeofday(&ioloop_timeval, &ioloop_timezone) < 0)
 		i_fatal("gettimeofday() failed: %m");
@@ -110,7 +111,7 @@
 	io->callback = callback;
 	io->context = context;
 
-	EV_SET(ev, fd, EVFILT_VNODE, EV_ADD,
+	EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD,
 	       NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_REVOKE, 0, io);
 	if (kevent(ctx->kq, &ev, 1, NULL, 0, NULL) < 0) {
 		i_error("kevent(%d, %s) for notify failed: %m", fd, path);
@@ -135,7 +136,7 @@
 
 	i_assert((io->condition & IO_NOTIFY) != 0);
 
-	EV_SET(ev, io->fd, EVFILT_VNODE, EV_DELETE, 0, 0, NULL);
+	EV_SET(&ev, io->fd, EVFILT_VNODE, EV_DELETE, 0, 0, NULL);
 	if (kevent(ctx->kq, &ev, 1, NULL, 0, 0) < 0)
 		i_error("kevent(%d) for notify remove failed: %m", io->fd);
 	if (close(io->fd) < 0)



More information about the dovecot-cvs mailing list