-ssize_t
-mutt_FormatString(char *dst, ssize_t dlen, const char *fmt,
- format_t *callback, unsigned long data, format_flag flags)
+ssize_t m_strformat(char *dst, ssize_t dlen, const char *fmt,
+ format_t *callback, unsigned long data, format_flag flags)
- ssize_t wid;
-
- mutt_FormatString(buf, sizeof(buf), fmt, callback, data, flags);
- wid = mutt_strwidth(buf);
-
- pos += m_strpad(dst + pos, dlen - pos, ch, COLS - SW - col - wid);
+ m_strformat(buf, sizeof(buf), fmt, callback, data, flags);
+ pos += m_strpad(dst + pos, dlen - pos, ch,
+ COLS - SW - col - mutt_strwidth(buf));
pos += m_strcpy(dst + pos, dlen - pos, buf);
}
return pos; /* skip rest of input */
pos += m_strcpy(dst + pos, dlen - pos, buf);
}
return pos; /* skip rest of input */
- case '|':
- col = mutt_strwidth(dst);
-
- ch = *fmt++;
- /* pad to EOL */
- pos += m_strpad(dst + pos, dlen - pos, ch, COLS - SW - col);
- return pos; /* skip rest of input */
+ case '|': /* pad to EOL */
+ return pos + m_strpad(dst + pos, dlen - pos, *fmt,
+ COLS - SW - mutt_strwidth(dst));
case 'n': pos += m_strputc(dst + pos, dlen - pos, '\n'); break;
case 't': pos += m_strputc(dst + pos, dlen - pos, '\t'); break;
case 'r': pos += m_strputc(dst + pos, dlen - pos, '\r'); break;
case 'f': pos += m_strputc(dst + pos, dlen - pos, '\f'); break;
case 'v': pos += m_strputc(dst + pos, dlen - pos, '\v'); break;
case 'n': pos += m_strputc(dst + pos, dlen - pos, '\n'); break;
case 't': pos += m_strputc(dst + pos, dlen - pos, '\t'); break;
case 'r': pos += m_strputc(dst + pos, dlen - pos, '\r'); break;
case 'f': pos += m_strputc(dst + pos, dlen - pos, '\f'); break;
case 'v': pos += m_strputc(dst + pos, dlen - pos, '\v'); break;