X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=3a50a27ce47ab301ae317353f800fed9a2986b8b;hp=ab94832caaa726aaac76c1d3d5ca03a2629d42b2;hb=4a9b680b609b28274a8ae704819f3b59b4e3b4d7;hpb=1caa23ff879cec7f8f36b32a987f0610291ef177 diff --git a/log.c b/log.c index ab94832..3a50a27 100644 --- a/log.c +++ b/log.c @@ -22,7 +22,7 @@ static void vMessage(uint32_t class, const char *message, va_list args) size_t bp; char *nlp; - if (secnet_is_daemon) { + if (system_log) { /* Messages go to the system log interface */ bp=strlen(buff); assert(bp < MESSAGE_BUFLEN); @@ -488,8 +488,7 @@ struct fdlog { }; static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, - int *timeout_io, - const struct timeval *tv_now, uint64_t *now) + int *timeout_io) { struct fdlog *st=sst; if (!st->finished) { @@ -500,8 +499,7 @@ static int log_from_fd_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, return 0; } -static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds, - const struct timeval *tv_now, uint64_t *now) +static void log_from_fd_afterpoll(void *sst, struct pollfd *fds, int nfds) { struct fdlog *st=sst; int r,remain,i;