#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mime.h"
#include "buffy.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <errno.h>
size_t l;
for (p = b->parameter; p; p = p->next) {
- l = str_len (buf);
+ l = m_strlen(buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);