Merge branch 'master' into 4.next

[user/henk/code/exim.git] / src / src / auths / xtextencode.c

diff --git a/src/src/auths/xtextencode.c b/src/src/auths/xtextencode.c
index 7cdfe322495504d9fe5b1890c7b380299e948e28..4d189fc0668f5100709469a82928bd6aa1e87823 100644 (file)
--- a/src/src/auths/xtextencode.c
+++ b/src/src/auths/xtextencode.c
@@ -28,7 +28,7 @@ uschar *
 auth_xtextencode(uschar *clear, int len)
 {
 uschar *code;
-uschar *p = (uschar *)clear;
+uschar *p = US clear;
 uschar *pp;
 int c = len;
 int count = 1;
@@ -42,17 +42,13 @@ while (c -- > 0)
 
 pp = code = store_get(count);
 
-p = (uschar *)clear;
+p = US clear;
 c = len;
 while (c-- > 0)
-  {
   if ((x = *p++) < 33 || x > 127 || x == '+' || x == '=')
-    {
-    sprintf(CS pp, "+%.02x", x);   /* There's always room */
-    pp += 3;
-    }
-  else *pp++ = x;
-  }
+    pp += sprintf(CS pp, "+%.02x", x);   /* There's always room */
+  else
+    *pp++ = x;
 
 *pp = 0;
 return code;