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);
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;
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];
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
}
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);
}