X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fdemime.c;h=887678db3300df4bd3513b943ac04cbfaf0214e5;hb=10a831a31f38ad32dcf140ac50178b845a60a126;hp=2eac6cde6ce37b87b7b62d470d3694774dc38c62;hpb=2632889eca3018763375f85b31212712044c395f;p=exim.git diff --git a/src/src/demime.c b/src/src/demime.c index 2eac6cde6..887678db3 100644 --- a/src/src/demime.c +++ b/src/src/demime.c @@ -1,5 +1,3 @@ -/* $Cambridge: exim/src/src/demime.c,v 1.9 2006/02/22 14:46:44 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ @@ -47,7 +45,7 @@ int demime(uschar **listptr) { }; /* make sure the eml mbox file is spooled up */ - mbox_file = spool_mbox(&mbox_size); + mbox_file = spool_mbox(&mbox_size, NULL); if (mbox_file == NULL) { /* error while spooling */ @@ -823,7 +821,7 @@ void mime_trigger_error(int level, uschar *format, ...) { (void)string_vformat(US f, 16383,(char *)format, ap); va_end(ap); f-=22; - log_write(0, LOG_MAIN, f); + log_write(0, LOG_MAIN, "%s", f); /* then copy to demime_reason_buffer if new level is greater than old level */ if (level > demime_errorlevel) {