diff options
author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-12-05 14:55:37 +0000 |
---|---|---|
committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2005-12-05 14:55:37 +0000 |
commit | 9e15953f68baa1d7805d3e48adbdf6be99c1cc94 (patch) | |
tree | 88b6797ff211929fc984bb79b557819455847b3b /src/select.c | |
parent | 69e124e90021ada331f0a17afa8b1481ac80a53e (diff) |
rename all linux list related structs/functs/macros to 'llist', since mysql is now cluttering the namespace by its 'list_add' function.
Diffstat (limited to 'src/select.c')
-rw-r--r-- | src/select.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/select.c b/src/select.c index 297fb97..6344a45 100644 --- a/src/select.c +++ b/src/select.c @@ -26,7 +26,7 @@ #include <ulogd/linuxlist.h> static int maxfd = 0; -static LIST_HEAD(ulogd_fds); +static LLIST_HEAD(ulogd_fds); int ulogd_register_fd(struct ulogd_fd *fd) { @@ -45,14 +45,14 @@ int ulogd_register_fd(struct ulogd_fd *fd) if (fd->fd > maxfd) maxfd = fd->fd; - list_add_tail(&fd->list, &ulogd_fds); + llist_add_tail(&fd->list, &ulogd_fds); return 0; } void ulogd_unregister_fd(struct ulogd_fd *fd) { - list_del(&fd->list); + llist_del(&fd->list); } int ulogd_select_main() @@ -66,7 +66,7 @@ int ulogd_select_main() FD_ZERO(&exceptset); /* prepare read and write fdsets */ - list_for_each_entry(ufd, &ulogd_fds, list) { + llist_for_each_entry(ufd, &ulogd_fds, list) { if (ufd->when & ULOGD_FD_READ) FD_SET(ufd->fd, &readset); @@ -80,7 +80,7 @@ int ulogd_select_main() i = select(maxfd+1, &readset, &writeset, &exceptset, NULL); if (i > 0) { /* call registered callback functions */ - list_for_each_entry(ufd, &ulogd_fds, list) { + llist_for_each_entry(ufd, &ulogd_fds, list) { int flags = 0; if (FD_ISSET(ufd->fd, &readset)) |