some cleanup, no libevent left

diff --git a/Makefile.am b/Makefile.am
index 79947cc..90be121 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ rxpd_srcdir = $(top_srcdir)/src
 bin_PROGRAMS = rxpd
 
 rxpd_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Wextra -Werror
-rxpd_LDADD = -lpth -levent
+rxpd_LDADD = -lpth
 
 rxpd_SOURCES =                                 \
        $(rxpd_srcdir)/rxpd.h                   \

diff --git a/configure.ac b/configure.ac
index a4c2f5a..facb3e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,9 @@ AC_PROG_CPP
 #
 AC_STDC_HEADERS
 
-AH_TEMPLATE(HAVE_EVENT_H, [check for libevent])
-AC_CHECK_HEADER([event.h], AC_DEFINE(HAVE_EVENT_H))
+# TODO use pth-config
+AH_TEMPLATE(HAVE_PTH_H, [check for gnu-pth])
+AC_CHECK_HEADER([pth.h], AC_DEFINE(HAVE_PTH_H))
 
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT

diff --git a/src/main.c b/src/main.c
index e54e469..fc1b322 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -27,9 +27,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <event.h>
-
-
 void
 version (void)
 {
@@ -209,7 +206,7 @@ main (int argc, char** argv)
 
   rxpd_log (rxpd, LOG_NOTICE, PACKAGE_STRING" running\n");
 
-  LLIST_FOREACH (&rxpd->sockets, n)
+  LLIST_WHILE_HEAD (&rxpd->sockets, n)
     {
       struct rxpd_socket* socket = (struct rxpd_socket*)n;
       rxpd_socket_delete (rxpd_socket_join (socket));

diff --git a/src/rxpd_buffer.c b/src/rxpd_buffer.c
index 5f489fe..74dd47c 100644 (file)
--- a/src/rxpd_buffer.c
+++ b/src/rxpd_buffer.c
@@ -86,16 +86,6 @@ rxpd_buffer_readline (struct rxpd_buffer* self)
   return NULL;
 }
 
-/*
-void
-rxpd_buffer_write(int fd, short event, void* ptr)
-{
-  struct rxpd_buffer* self = (struct rxpd_buffer*) ptr;
-
-  ssize_t n = write(int fd, const void *buf, size_t count);
-
-}
-*/
 
 int
 rxpd_buffer_printf (struct rxpd_buffer* self, const char* fmt, ...)

diff --git a/src/rxpd_socket.c b/src/rxpd_socket.c
index e8a1e9c..507c561 100644 (file)
--- a/src/rxpd_socket.c
+++ b/src/rxpd_socket.c
@@ -92,7 +92,6 @@ rxpd_socket_delete (struct rxpd_socket* self)
 {
   if (self)
     {
-      event_del (&self->ev);
       llist_unlink (&self->node);
       close (self->fd);
     }