HEADER *hdr;
};
-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)
+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 = data.ptr;
HEADER *hdr, *htmp;
break;
default:
- snprintf (dest, destlen, "%%%s%c", prefix, op);
+ *dest = 0;
break;
}
- if (optional)
- m_strformat(dest, destlen, ifstr, hdr_format_str, data, flags);
- else if (flags & M_FORMAT_OPTIONAL)
- m_strformat(dest, destlen, elstr, hdr_format_str, data, 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;
- m_strformat(dest, destlen, s, hdr_format_str, &hfi, flags);
+ m_strformat(dest, destlen, COLS - SW, s, hdr_format_str, &hfi, flags);
}