More compiler quitening.

diff --git a/src/src/acl.c b/src/src/acl.c
index a862277a5b21db73b02a0cedc09d01dee1ce32cb..5af408c5c1346440df8bc6c2758c4d7a39fa7c18 100644 (file)
--- 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
 acl_eval(int where, uschar *s, uschar **user_msgptr, uschar **log_msgptr)
 {

-int rc;

 address_item adb;
 address_item *addr = NULL;
 
 address_item adb;
 address_item *addr = NULL;
 

diff --git a/src/src/auths/auth-spa.c b/src/src/auths/auth-spa.c
index 87e5f4e8f42c847b406bb66f7b74241172fdb748..7ad5a1de8214a3884ee967f2ad466f5ced013551 100644 (file)
--- 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) \
 { \
 
 #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); \
   { \
   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 ddd81d1d33f54d0c8b369a265057e040c614b474..454029c8e14ca4597869621d4593ae3e9b7b3030 100644 (file)
--- 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;
      {
       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);
       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 2d594e46ebd894c825afa4e86a0beec7056e450c..9b9b71790c085b2fbf06ed3961b0d776fed573d6 100644 (file)
--- 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"";
 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;
 
 flock_t lock_data;
 error_block *bad_addresses = NULL;