the ‘kids don't do this at home’ commit.

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

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 3d22756..ee03a15 100644 (file)
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -215,11 +215,11 @@ static const char *hdr_format_str (char *dest,
                                    char op,
                                    const char *src,
                                    const char *prefix,
-                                   const char *ifstring,
-                                   const char *elsestring,
-                                   unsigned long data, format_flag flags)
+                                   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[STRING], buf2[STRING], ch, *p;
@@ -707,11 +707,9 @@ static const char *hdr_format_str (char *dest,
   }
 
   if (optional)
-    m_strformat(dest, destlen, ifstring, hdr_format_str,
-                (unsigned long)hfi, flags);
+    m_strformat(dest, destlen, ifstr, hdr_format_str, data, flags);
   else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elsestring, hdr_format_str,
-                (unsigned long)hfi, flags);
+    m_strformat(dest, destlen, elstr, hdr_format_str, data, flags);
 
   return (src);
 #undef THREAD_NEW
@@ -727,5 +725,5 @@ _mutt_make_string (char *dest, ssize_t destlen, const char *s, CONTEXT * ctx,
   hfi.hdr = hdr;
   hfi.ctx = ctx;
 
-  m_strformat(dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags);
+  m_strformat(dest, destlen, s, hdr_format_str, &hfi, flags);
 }