let m_strformat accept NULL formats.

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index f8fbb3d..b135b33 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -300,12 +300,12 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
     break;
   }
 
-  if (optional)
-    m_strformat (dest, destlen, ifstr, folder_format_str, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elstr, folder_format_str, data, 0);
 
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, optional ? ifstr : elstr, folder_format_str,
+                data, 0);
+
+  return src;
 }
 
 #ifdef USE_NNTP
@@ -644,13 +644,11 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
 
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    m_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str,
-                (void*)&folder,
+    m_strformat(s, slen, GroupFormat, newsgroup_format_str, &folder,
                 option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
   else
 #endif
-    m_strformat(s, slen, NONULL (FolderFormat), folder_format_str,
-               (void *)&folder,
+    m_strformat(s, slen, FolderFormat, folder_format_str, &folder,
                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }