X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=log.c;h=6dbf25aa3492afba341a511ff7e29441a2894ce6;hb=32fc582f43a9a3841d2782674e055113729c2814;hp=4aa12e753d47abaa8e5ef0a6979a13d275e15c6c;hpb=ff1dcd860a6176d24ad1dd7c3b8756c685ca90c6;p=secnet.git

diff --git a/log.c b/log.c
index 4aa12e7..6dbf25a 100644
--- a/log.c
+++ b/log.c
@@ -189,17 +189,6 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args)
     }
 }
 
-static void log_multi(void *st, int priority, const char *message, ...)
-    FORMAT(printf,3,4);
-static void log_multi(void *st, int priority, const char *message, ...)
-{
-    va_list ap;
-
-    va_start(ap,message);
-    log_vmulti(st,priority,message,ap);
-    va_end(ap);
-}
-
 struct log_if *init_log(list_t *ll)
 {
     int i=0;
@@ -409,17 +398,6 @@ static void syslog_vlog(void *sst, int class, const char *message,
     }
 }
 
-static void syslog_log(void *sst, int priority, const char *message, ...)
-    FORMAT(printf,3,4);
-static void syslog_log(void *sst, int priority, const char *message, ...)
-{
-    va_list ap;
-
-    va_start(ap,message);
-    syslog_vlog(sst,priority,message,ap);
-    va_end(ap);
-}
-
 static struct flagstr syslog_facility_table[]={
 #ifdef LOG_AUTH
     { "auth", LOG_AUTH },
@@ -507,9 +485,11 @@ static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
 {
     struct fdlog *st=sst;
     if (!st->finished) {
-	*nfds_io=1;
+	BEFOREPOLL_WANT_FDS(1);
 	fds[0].fd=st->fd;
 	fds[0].events=POLLIN;
+    } else {
+	BEFOREPOLL_WANT_FDS(0);
     }
     return 0;
 }
@@ -565,7 +545,7 @@ void log_from_fd(int fd, cstring_t prefix, struct log_if *log)
     st->i=0;
     st->finished=False;
 
-    register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,1,
+    register_for_poll(st,log_from_fd_beforepoll,log_from_fd_afterpoll,
 		      prefix);
 }