X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=log.c;h=6f4b7380198e7ad37dbf367d36b43b39a704e979;hp=f4ef8000605c866121031ecb4babf2965c2aa1ff;hb=0e212483f7cedbbbea7f5dce9323fd0205620927;hpb=389070fed67552c613ce5afd3cdb436f8f8c538f

diff --git a/log.c b/log.c
index f4ef800..6f4b738 100644
--- a/log.c
+++ b/log.c
@@ -19,17 +19,18 @@ static void vMessage(uint32_t class, const char *message, va_list args)
     FILE *dest=stdout;
 #define MESSAGE_BUFLEN 1023
     static char buff[MESSAGE_BUFLEN+1]={0,};
-    uint32_t bp;
+    size_t bp;
     char *nlp;
 
     if (secnet_is_daemon) {
 	/* Messages go to the system log interface */
 	bp=strlen(buff);
+	assert(bp < MESSAGE_BUFLEN);
 	vsnprintf(buff+bp,MESSAGE_BUFLEN-bp,message,args);
 	/* Each line is sent separately */
 	while ((nlp=strchr(buff,'\n'))) {
 	    *nlp=0;
-	    slilog(system_log,class,buff);
+	    slilog(system_log,class,"%s",buff);
 	    memmove(buff,nlp+1,strlen(nlp+1)+1);
 	}
     } else {
@@ -487,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) {
@@ -499,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;