Subversion Repositories

Description: Eliminate most compiler warnings
 Changing the type of scantime  and fulltime from time_t to int is
 probably not only not a problem, but the right thing to do, as
 they will contain time differences, not timestamps.
Bug-Debian: https://bugs.debian.org/943570

--- a/sa-exim.c
+++ b/sa-exim.c
@@ -282,7 +282,7 @@ static int savemail(int readfd, off_t fd
 
     if (SAEximDebug > 8)
     {
-       log_write(0, LOG_MAIN, "SA: Debug9: Archive body write starts: writing up to %d bytes in %d byte blocks", SAmaxarchivebody, sizeof(buffera));
+       log_write(0, LOG_MAIN, "SA: Debug9: Archive body write starts: writing up to %d bytes in %zd byte blocks", SAmaxarchivebody, sizeof(buffera));
     }
 
     towrite=SAmaxarchivebody;
@@ -539,8 +539,8 @@ int local_scan(volatile int fd, uschar *
     time_t beforescan;
     time_t afterscan;
     time_t afterwait;
-    time_t scantime=0;
-    time_t fulltime=0;
+    int scantime=0;
+    int fulltime=0;
     struct stat stbuf;
 
     uschar *expand;
@@ -1197,7 +1197,7 @@ restart:
        {
            if (SAEximDebug > 5)
            {
-               log_write(0, LOG_MAIN, "SA: Debug6: spamc read got newline, end of headers", buffer);
+               log_write(0, LOG_MAIN, "SA: Debug6: spamc read got newline, end of headers");
            }
            goto exit;
        }
@@ -1257,7 +1257,7 @@ restart:
        {
            if (SAEximDebug > 8)
            {
-               log_write(0, LOG_MAIN, "SA: Debug9: Read body from SA; line %d (read %d)", line, strlen(buffer));
+               log_write(0, LOG_MAIN, "SA: Debug9: Read body from SA; line %d (read %zd)", line, strlen(buffer));
            }
 
            stret=write(fd, buffer, strlen(buffer));