#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "copy.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <ctype.h>
#include <stdlib.h>
str_replace (&idx[x]->tree, buf);
}
else
- idx[x]->tree = str_dup (buf);
+ idx[x]->tree = m_strdup(buf);
if (2 * (idx[x]->level + 2) < sizeof (buf) && idx[x]->level) {
s = buf + 2 * (idx[x]->level - 1);
for (; m; m = m->next) {
if (*idxlen == *idxmax) {
- mem_realloc (&idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5));
+ p_realloc(&idx, (*idxmax) += 5);
for (i = *idxlen; i < *idxmax; i++)
idx[i] = NULL;
}