Expansions: New ${ipv6denorm:<string>} and ${ipv6norm:<string>} operators. Bug 1650

[exim.git] / src / src / imap_utf7.c

diff --git a/src/src/imap_utf7.c b/src/src/imap_utf7.c
index b2695cdb913169338eb9672d0454578119807566..739e47f41f246e8a5072adac454dcf0fd1d4fb85 100644 (file)
--- a/src/src/imap_utf7.c
+++ b/src/src/imap_utf7.c
@@ -12,8 +12,8 @@ int ptr = 0;
 int size = 0;
 size_t slen;
 uschar *sptr, *yield = NULL;
-int i, j;
-uschar c;
+int i = 0, j;  /* compiler quietening */
+uschar c = 0;  /* compiler quietening */
 BOOL base64mode = FALSE;
 BOOL lastsep = FALSE;
 uschar utf16buf[256];
@@ -57,7 +57,7 @@ if ((icd = iconv_open("UTF-16BE", CCS charset)) == (iconv_t)-1)
     errno == EINVAL ? " (maybe unsupported conversion)" : "");
   return NULL;
   }
-#endif  
+#endif
 
 while (slen > 0)
   {
@@ -76,7 +76,7 @@ while (slen > 0)
     return NULL;
     }
 #else
-  for (utf16ptr = utf16buf; 
+  for (utf16ptr = utf16buf;
        slen > 0 && (utf16ptr - utf16buf) < sizeof(utf16buf);
        utf16ptr += 2, slen--, sptr++)
     {
@@ -92,19 +92,19 @@ while (slen > 0)
     if (  s[0] != 0
        || s[1] >= 0x7f
        || s[1] < 0x20
-       || (strchr(specials, s[1]) && s[1] != sep)
+       || (Ustrchr(specials, s[1]) && s[1] != sep)
        )
       {
       lastsep = FALSE;
       /* Encode as modified BASE64 */
-      if (!base64mode) 
+      if (!base64mode)
         {
         *outptr++ = '&';
         base64mode = TRUE;
         i = 0;
         }
 
-      for (j = 0; j < 2; j++, s++) switch (i++) 
+      for (j = 0; j < 2; j++, s++) switch (i++)
        {
        case 0:
          /* Top 6 bits of the first octet */
@@ -130,7 +130,7 @@ while (slen > 0)
       /* Encode as self (almost) */
       if (base64mode)
         {
-        switch (i) 
+        switch (i)
           {
           case 1:
                /* Remaining bottom 2 bits of the last octet */
@@ -176,11 +176,11 @@ while (slen > 0)
       }
 
     }
-  } /* End of input string */  
+  } /* End of input string */
 
-if (base64mode) 
+if (base64mode)
   {
-  switch (i) 
+  switch (i)
     {
     case 1:
       /* Remaining bottom 2 bits of the last octet */