From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 6 Dec 2014 15:18:56 +0000 (+0000)
Subject: Compiler quietening
X-Git-Tag: exim-4_91_RC1~148^2~42^2~60
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/da13ad8af70f2c286dabcb6fd5565be4aeb43c7b?ds=inline

Compiler quietening
---

diff --git a/src/src/malware.c b/src/src/malware.c
index 339e20333..9a83b9377 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -1604,7 +1604,7 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
 	    if ((malware_name = m_pcre_exec(avast_virus_re, buf)))
 	      {
 	      /* remove backslashes from the virus string */
-	      char *p, *q;
+	      uschar *p, *q;
 	      for (p = malware_name; *p; p++) if (*p == '\\')
 		for (q = p; *q; q++) *q = q[1];
 
diff --git a/src/src/readconf.c b/src/src/readconf.c
index df4cbb2fd..c6f396f85 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3011,9 +3011,9 @@ if (config_file != NULL)
   uschar *p;
   config_filename = config_main_filename = string_copy(filename);
 
-  p = strrchr(filename, '/');
+  p = Ustrrchr(filename, '/');
   config_main_directory = p ? string_copyn(filename, p - filename) 
-                            : string_copy(".");
+                            : string_copy(US".");
   }
 else
   {
diff --git a/src/src/spam.c b/src/src/spam.c
index 45a06931c..c0c3fb373 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -48,7 +48,7 @@ spam(uschar **listptr)
   fd_set select_fd;
 #endif
   uschar *spamd_address_work;
-  static const char * loglabel = US"spam acl condition:";
+  static const uschar * loglabel = US"spam acl condition:";
 
   /* stop compiler warning */
   result = 0;