small refactoring

* replace ESC_CHAR macro with function
* added braces to if logic to improve readability

diff --git a/commands.c b/commands.c
index 4aa0aec5356e9e8fc809038fedb7874677bf6858..9a313c9901f7ef72336669d2eb9663a2a3bec4dc 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -1047,7 +1047,9 @@ int mutt_check_traditional_pgp(struct Header *h, int *redraw)
     for (i = 0; i < Context->vcount; i++)
       if (Context->hdrs[Context->v2r[i]]->tagged &&
           !(Context->hdrs[Context->v2r[i]]->security & PGP_TRADITIONAL_CHECKED))
+      {
         rv = _mutt_check_traditional_pgp(Context->hdrs[Context->v2r[i]], redraw) || rv;
+      }
   }
   return rv;
 }

diff --git a/init.c b/init.c
index a06d9260820d64e8138458811909dfa8fa485d34..0b978c9b003194b54d11d625c5bc50d94ac814d3 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2066,6 +2066,13 @@ static void restore_default(struct Option *p)
     mutt_set_current_menu_redraw_full();
 }
 
+static void ESC_char(char c, char *p, char *dst, size_t len)
+{
+  *p++ = '\\';
+  if (p - dst < len)
+    *p++ = c;
+}
+
 static size_t escape_string(char *dst, size_t len, const char *src)
 {
   char *p = dst;
@@ -2073,25 +2080,18 @@ static size_t escape_string(char *dst, size_t len, const char *src)
   if (!len)
     return 0;
   len--; /* save room for \0 */
-#define ESC_CHAR(C)                                                            \
-  do                                                                           \
-  {                                                                            \
-    *p++ = '\\';                                                               \
-    if (p - dst < len)                                                         \
-      *p++ = C;                                                                \
-  } while (0)
   while (p - dst < len && src && *src)
   {
     switch (*src)
     {
       case '\n':
-        ESC_CHAR('n');
+        ESC_char('n', p, dst, len);
         break;
       case '\r':
-        ESC_CHAR('r');
+        ESC_char('r', p, dst, len);
         break;
       case '\t':
-        ESC_CHAR('t');
+        ESC_char('t', p, dst, len);
         break;
       default:
         if ((*src == '\\' || *src == '"') && p - dst < len - 1)
@@ -2100,7 +2100,6 @@ static size_t escape_string(char *dst, size_t len, const char *src)
     }
     src++;
   }
-#undef ESC_CHAR
   *p = '\0';
   return p - dst;
 }