Use p_new instead of xmalloc()

[apps/madmutt.git] / lib-ui / hdrline.c

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 5797c22..92e6fa6 100644 (file)
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -7,20 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -219,19 +210,16 @@ struct hdr_format_info {
   HEADER *hdr;
 };
 
-static const char *hdr_format_str (char *dest,
-                                   ssize_t destlen,
-                                   char op,
-                                   const char *src,
-                                   const char *prefix,
-                                   const char *ifstring,
-                                   const char *elsestring,
-                                   unsigned long data, format_flag flags)
+static const char *
+hdr_format_str(char *dest, ssize_t destlen,
+               char op, const char *src, const char *prefix,
+               const char *ifstr, const char *elstr,
+               anytype data, format_flag flags)
 {
-  struct hdr_format_info *hfi = (struct hdr_format_info *) data;
+  struct hdr_format_info *hfi = data.ptr;
   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);
@@ -404,7 +392,7 @@ static const char *hdr_format_str (char *dest,
 
   case 'f':
     buf2[0] = 0;
-    rfc822_write_address (buf2, sizeof (buf2), hdr->env->from, 1);
+    rfc822_addrcat(buf2, sizeof (buf2), hdr->env->from, 1);
     mutt_format_s (dest, destlen, prefix, buf2);
     break;
 
@@ -447,7 +435,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];
@@ -637,12 +625,6 @@ static const char *hdr_format_str (char *dest,
     {
       int count = 0;
 
-      if (option (OPTCOUNTATTACH)) {
-        if (!hdr->content->parts)
-          mutt_parse_mime_message(ctx, hdr);
-        count = mutt_count_body_parts(hdr, 0);
-      }
-
       /* The recursion allows messages without depth to return 0. */
       if (optional)
         optional = count != 0;
@@ -717,18 +699,15 @@ static const char *hdr_format_str (char *dest,
     break;
 
   default:
-    snprintf (dest, destlen, "%%%s%c", prefix, op);
+    *dest = 0;
     break;
   }
 
-  if (optional)
-    mutt_FormatString (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);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr: elstr,
+                hdr_format_str, data, flags);
 
-  return (src);
+  return src;
 #undef THREAD_NEW
 #undef THREAD_OLD
 }
@@ -742,6 +721,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, COLS - SW, s, hdr_format_str, &hfi, flags);
 }