[exim-cvs] More compiler quietening.

Gitweb: http://git.exim.org/exim.git/commitdiff/d9d29e0555e6a3bf33cc616693d98c982796201f

Commit:     d9d29e0555e6a3bf33cc616693d98c982796201f
Parent:     4ea50c5f6f693efdf88c5dd1cf61c47e7878cfe6
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Nov 18 15:57:59 2012 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Nov 18 15:57:59 2012 +0000

    More compiler quietening.
---
 src/src/auths/gsasl_exim.c |    3 ++-
 src/src/readconf.c         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index aef337c..8f75416 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 454029c..dbec45d 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);