From 7437665e6205079041af7f56bcc3bee0a20c6d5c Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 22 May 2014 21:50:27 +0100
Subject: [PATCH] Compiler quietening.  Bug 907

---
 src/src/exim.c |  5 +++--
 src/src/tls.c  | 10 +++++-----
 src/src/tod.c  |  3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/src/exim.c b/src/src/exim.c
index 09e9c1cba..1435a0ac4 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -399,9 +399,10 @@ if (exim_tvcmp(&now_tv, then_tv) <= 0)
     if (!running_in_test_harness)
       {
       debug_printf("tick check: %lu.%06lu %lu.%06lu\n",
-        then_tv->tv_sec, then_tv->tv_usec, now_tv.tv_sec, now_tv.tv_usec);
+        then_tv->tv_sec, (long) then_tv->tv_usec,
+       	now_tv.tv_sec, (long) now_tv.tv_usec);
       debug_printf("waiting %lu.%06lu\n", itval.it_value.tv_sec,
-        itval.it_value.tv_usec);
+        (long) itval.it_value.tv_usec);
       }
     }
 
diff --git a/src/src/tls.c b/src/src/tls.c
index 841807f45..cb7efffe9 100644
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -241,7 +241,7 @@ uschar * match = NULL;
 int len;
 uschar * list = NULL;
 
-while (ele = string_nextinlist(&mod, &insep, NULL, 0))
+while ((ele = string_nextinlist(&mod, &insep, NULL, 0)))
   if (ele[0] != '>')
     match = ele;	/* field tag to match */
   else if (ele[1])
@@ -250,7 +250,7 @@ while (ele = string_nextinlist(&mod, &insep, NULL, 0))
 dn_to_list(dn);
 insep = ',';
 len = Ustrlen(match);
-while (ele = string_nextinlist(&dn, &insep, NULL, 0))
+while ((ele = string_nextinlist(&dn, &insep, NULL, 0)))
   if (Ustrncmp(ele, match, len) == 0 && ele[len] == '=')
     list = string_append_listele(list, outsep, ele+len+1);
 return list;
@@ -301,10 +301,10 @@ uschar * cmpname;
 if ((altnames = tls_cert_subject_altname(cert, US"dns")))
   {
   int alt_sep = '\n';
-  while (cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0))
+  while ((cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0)))
     {
     uschar * an = altnames;
-    while (certname = string_nextinlist(&an, &alt_sep, NULL, 0))
+    while ((certname = string_nextinlist(&an, &alt_sep, NULL, 0)))
       if (is_name_match(cmpname, certname))
 	return TRUE;
     }
@@ -319,7 +319,7 @@ else if ((subjdn = tls_cert_subject(cert, NULL)))
   while (cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0))
     {
     uschar * sn = subjdn;
-    while (certname = string_nextinlist(&sn, &sn_sep, NULL, 0))
+    while ((certname = string_nextinlist(&sn, &sn_sep, NULL, 0)))
       if (  *certname++ == 'C'
 	 && *certname++ == 'N'
 	 && *certname++ == '='
diff --git a/src/src/tod.c b/src/src/tod.c
index 9aa845c82..427227c68 100644
--- a/src/src/tod.c
+++ b/src/src/tod.c
@@ -59,7 +59,8 @@ if (type == tod_epoch_l)
   {
   struct timeval tv;
   gettimeofday(&tv, NULL);
-  (void) sprintf(CS timebuf, "%ld%06ld", tv.tv_sec, tv.tv_usec );  /* Unix epoch/usec format */
+  /* Unix epoch/usec format */
+  (void) sprintf(CS timebuf, "%ld%06ld", tv.tv_sec, (long) tv.tv_usec );
   return timebuf;
   }
 
-- 
2.30.2