Reduce variable scope - alias.c

diff --git a/alias.c b/alias.c
index 28a7b39d872a2d5730b5205ee1170bf413555a67..065a034d38b01649a3748e8a5d8332294fa4ad54 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -240,7 +240,7 @@ int check_alias_name(const char *s, char *dest, size_t destlen)
   wchar_t wc;
   mbstate_t mb;
   size_t l;
-  int rc = 0, bad = 0, dry = !dest || !destlen;
+  int rc = 0, dry = !dest || !destlen;
 
   memset(&mb, 0, sizeof(mbstate_t));
 
@@ -249,7 +249,7 @@ int check_alias_name(const char *s, char *dest, size_t destlen)
   for (; s && *s && (dry || destlen) && (l = mbrtowc(&wc, s, MB_CUR_MAX, &mb)) != 0;
        s += l, destlen -= l)
   {
-    bad = l == (size_t)(-1) || l == (size_t)(-2); /* conversion error */
+    int bad = l == (size_t)(-1) || l == (size_t)(-2); /* conversion error */
     bad = bad || (!dry && l > destlen);           /* too few room for mb char */
     if (l == 1)
       bad = bad || (strchr("-_+=.", *s) == NULL && !iswalnum(wc));
@@ -505,7 +505,6 @@ int mutt_alias_complete(char *s, size_t buflen)
   struct Alias *a = Aliases;
   struct Alias *a_list = NULL, *a_cur = NULL;
   char bestname[HUGE_STRING];
-  int i;
 
   if (s[0] != 0) /* avoid empty string as strstr argument */
   {
@@ -520,6 +519,7 @@ int mutt_alias_complete(char *s, size_t buflen)
                            MIN(mutt_str_strlen(a->name) + 1, sizeof(bestname)));
         else
         {
+          int i;
           for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++)
             ;
           bestname[i] = '\0';