X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fhdrline.c;h=3d22756b9416e6f69d415c119a9a7b16d3510373;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hp=f3e138ba41d690099f5f0f1ad678cf994f8aae95;hpb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e;p=apps%2Fmadmutt.git

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index f3e138b..3d22756 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -222,7 +222,7 @@ static const char *hdr_format_str (char *dest,
   struct hdr_format_info *hfi = (struct hdr_format_info *) data;
   HEADER *hdr, *htmp;
   CONTEXT *ctx;
-  char fmt[SHORT_STRING], buf2[SHORT_STRING], ch, *p;
+  char fmt[STRING], buf2[STRING], ch, *p;
   int do_locales, i;
   int optional = (flags & M_FORMAT_OPTIONAL);
   int threads = ((Sort & SORT_MASK) == SORT_THREADS);
@@ -438,7 +438,7 @@ static const char *hdr_format_str (char *dest,
       int j = 0;
 
       for (i = 0; hdr->env->from && hdr->env->from->personal &&
-           hdr->env->from->personal[i] && j < SHORT_STRING - 1; i++) {
+           hdr->env->from->personal[i] && j < STRING - 1; i++) {
         if (isalpha ((int) hdr->env->from->personal[i])) {
           if (!iflag) {
             buf2[j++] = hdr->env->from->personal[i];
@@ -707,11 +707,11 @@ static const char *hdr_format_str (char *dest,
   }
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, hdr_format_str,
-                       (unsigned long) hfi, flags);
+    m_strformat(dest, destlen, ifstring, hdr_format_str,
+                (unsigned long)hfi, flags);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, hdr_format_str,
-                       (unsigned long) hfi, flags);
+    m_strformat(dest, destlen, elsestring, hdr_format_str,
+                (unsigned long)hfi, flags);
 
   return (src);
 #undef THREAD_NEW
@@ -727,6 +727,5 @@ _mutt_make_string (char *dest, ssize_t destlen, const char *s, CONTEXT * ctx,
   hfi.hdr = hdr;
   hfi.ctx = ctx;
 
-  mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi,
-                     flags);
+  m_strformat(dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags);
 }