From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 17 Nov 2012 23:16:58 +0000 (+0000)
Subject: More compiler quitening.
X-Git-Tag: exim-4_81_RC1~3^2~42
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/4ea50c5f6f693efdf88c5dd1cf61c47e7878cfe6?hp=6c60858ca0037cfdbd48dac9f221da35a0ea64b6

More compiler quitening.
---

diff --git a/src/src/acl.c b/src/src/acl.c
index a862277a5..5af408c5c 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -4010,7 +4010,6 @@ return search_find_defer?DEFER:ERROR;
 int
 acl_eval(int where, uschar *s, uschar **user_msgptr, uschar **log_msgptr)
 {
-int rc;
 address_item adb;
 address_item *addr = NULL;
 
diff --git a/src/src/auths/auth-spa.c b/src/src/auths/auth-spa.c
index 87e5f4e8f..7ad5a1de8 100644
--- a/src/src/auths/auth-spa.c
+++ b/src/src/auths/auth-spa.c
@@ -1236,7 +1236,7 @@ char versionString[] = "libntlm version 0.21";
 
 #define spa_bytes_add(ptr, header, buf, count) \
 { \
-if (buf && count) \
+if (buf != NULL  &&  count) \
   { \
   SSVAL(&ptr->header.len,0,count); \
   SSVAL(&ptr->header.maxlen,0,count); \
diff --git a/src/src/readconf.c b/src/src/readconf.c
index ddd81d1d3..454029c8e 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -1549,7 +1549,7 @@ switch (type)
      {
       uschar sep = Ustrncmp(name, "headers_add", 11)==0 ? '\n' : ':';
       saved_condition = *str_target;
-      strtemp = saved_condition + strlen(saved_condition)-1;
+      strtemp = saved_condition + strlen((char *)saved_condition)-1;
       if (*strtemp == sep) *strtemp = 0;	/* eliminate trailing list-sep */
       strtemp = string_sprintf("%s%c%s", saved_condition, sep, sptr);
       *str_target = string_copy_malloc(strtemp);
diff --git a/src/src/receive.c b/src/src/receive.c
index 2d594e46e..9b9b71790 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1401,7 +1401,7 @@ BOOL resents_exist = FALSE;
 uschar *resent_prefix = US"";
 uschar *blackholed_by = NULL;
 uschar *blackhole_log_msg = US"";
-int  cutthrough_done;
+int  cutthrough_done = 0;
 
 flock_t lock_data;
 error_block *bad_addresses = NULL;