From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 18 Nov 2012 15:57:59 +0000 (+0000)
Subject: More compiler quietening.
X-Git-Tag: exim-4_81_RC1~3^2~41
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9d29e0555e6a3bf33cc616693d98c982796201f;p=exim.git

More compiler quietening.
---

diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index aef337c44..8f7541642 100644
--- a/src/src/auths/gsasl_exim.c
+++ b/src/src/auths/gsasl_exim.c
@@ -29,7 +29,8 @@ sense in all contexts.  For some, we can do checks at init time.
 
 #ifndef AUTH_GSASL
 /* dummy function to satisfy compilers when we link in an "empty" file. */
-static void dummy(int x) { dummy(x-1); }
+static void dummy2(int x) { dummy2(x-1); }
+static void dummy(int x) { dummy2(x-1); }
 #else
 
 #include <gsasl.h>
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 454029c8e..dbec45de3 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((char *)saved_condition)-1;
+      strtemp = saved_condition + Ustrlen(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);