mutt_FormatString -> m_strformat (will soon end up into the str lib \o/)

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index 226953d..40f5bba 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -388,9 +388,9 @@ static const char *mix_entry_fmt (char *dest,
     }
 
     if (optional)
-        mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
+        m_strformat (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
     else if (flags & M_FORMAT_OPTIONAL)
-        mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
+        m_strformat (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
     return (src);
 }
 
@@ -401,7 +401,7 @@ static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
     remailer_t **type2_list = (remailer_t **) menu->data;
     int w = (COLS-SW) > blen ? blen : (COLS-SW);
 
-    mutt_FormatString (b, w, NONULL (MixEntryFormat), mix_entry_fmt,
+    m_strformat (b, w, NONULL (MixEntryFormat), mix_entry_fmt,
                        (unsigned long) type2_list[num], M_FORMAT_ARROWCURSOR);
 }
 
@@ -457,7 +457,7 @@ void mix_make_chain (string_list_t ** chainp, int *redraw)
     struct coord *coords = NULL;
 
     MUTTMENU *menu;
-    char helpstr[SHORT_STRING];
+    char helpstr[STRING];
     short loop = 1;
     int op;
 
@@ -672,17 +672,16 @@ int mix_check_message (HEADER * msg)
 
     if (need_hostname) {
 
-        if (!(fqdn = mutt_fqdn (1))) {
+        if (!(fqdn = mutt_fqdn(1))) {
             mutt_error
-                _
-                ("Please set the hostname variable to a proper value when using mixmaster!");
-            return (-1);
+                _("Please set the hostname variable to a proper value when using mixmaster!");
+            return -1;
         }
 
         /* Cc and Bcc are empty at this point. */
-        rfc822_qualify (msg->env->to, fqdn);
-        rfc822_qualify (msg->env->reply_to, fqdn);
-        rfc822_qualify (msg->env->mail_followup_to, fqdn);
+        rfc822_qualify(msg->env->to, fqdn);
+        rfc822_qualify(msg->env->reply_to, fqdn);
+        rfc822_qualify(msg->env->mail_followup_to, fqdn);
     }
 
     return 0;