    };
  
    /* remember expanded spamd_address if needed */
-@@ -440,4 +574,122 @@ again:
+@@ -440,4 +574,126 @@ again:
    };
  }
  
++#ifdef __GNUC__
++static int
++spam_push_line(struct iovec *iov, const int i, const char *fmt, ...)  __attribute__ ((format (printf, 3, 4)));
++#endif
 +static int
 +spam_push_line(struct iovec *iov, const int i, const char *fmt, ...)
 +{

 #define F_FREESP     O_TRUNC
 typedef struct flock flock_t;
diff --git a/src/src/expand.c b/src/src/expand.c
index 7803862..888226f 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -608,6 +608,7 @@ static var_entry var_table[] = {
   { "sn8",                 vtype_filter_int,  &filter_sn[8] },
   { "sn9",                 vtype_filter_int,  &filter_sn[9] },
 #ifdef WITH_CONTENT_SCAN

 extern uschar *spam_score_int;         /* spam_score * 10 (int) */
 #endif
diff --git a/src/src/spam.c b/src/src/spam.c
index 63395f2..41fd4ac 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -14,12 +14,20 @@
