Module Name: src
Committed By: christos
Date: Sun Jan 24 19:15:57 UTC 2016
Modified Files:
src/external/bsd/wpa/dist/src/utils: eloop.c
Log Message:
use 0 for udata for portability (FreeBSD has a pointer, we have uintptr_t)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/wpa/dist/src/utils/eloop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/utils/eloop.c
diff -u src/external/bsd/wpa/dist/src/utils/eloop.c:1.11 src/external/bsd/wpa/dist/src/utils/eloop.c:1.12
--- src/external/bsd/wpa/dist/src/utils/eloop.c:1.11 Fri Jan 22 15:21:04 2016
+++ src/external/bsd/wpa/dist/src/utils/eloop.c Sun Jan 24 14:15:56 2016
@@ -237,7 +237,7 @@ static int eloop_sock_queue(int sock, el
default:
filter = 0;
}
- EV_SET(&ke, sock, filter, EV_ADD, 0, 0, NULL);
+ EV_SET(&ke, sock, filter, EV_ADD, 0, 0, 0);
if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) == -1) {
wpa_printf(MSG_ERROR, "%s: kevent(ADD) for fd=%d "
"failed. %s\n", __func__, sock, strerror(errno));
@@ -407,7 +407,7 @@ static void eloop_sock_table_remove_sock
os_memset(&eloop.fd_table[sock], 0, sizeof(struct eloop_sock));
#endif /* CONFIG_ELOOP_EPOLL */
#ifdef CONFIG_ELOOP_KQUEUE
- EV_SET(&ke, sock, 0, EV_DELETE, 0, 0, NULL);
+ EV_SET(&ke, sock, 0, EV_DELETE, 0, 0, 0);
if (kevent(eloop.kqueuefd, &ke, 1, NULL, 0, NULL) == -1) {
wpa_printf(MSG_ERROR, "%s: kevent(DEL) for fd=%d "
"failed. %s\n", __func__, sock, strerror(errno));
@@ -1328,7 +1328,7 @@ void eloop_wait_for_read_sock(int sock)
kfd = kqueue();
if (kfd == -1)
return;
- EV_SET(&ke1, sock, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, NULL);
+ EV_SET(&ke1, sock, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, 0);
kevent(kfd, &ke1, 1, &ke2, 1, NULL);
close(kfd);
#endif /* CONFIG_ELOOP_KQUEUE */
