#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <stdio.h>
break;
bytes -= str_len (p);
if (*bufmax == *buflen)
- mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+ p_realloc(&buf, *bufmax += 25);
buf[(*buflen)++] = str_dup (tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
- mem_realloc (&buf, sizeof (char *) * (++*bufmax));
+ p_realloc(&buf, ++*bufmax);
}
if (buf)
buf[*buflen] = NULL;
}
if (*bufmax == *buflen)
- mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+ p_realloc(&buf, *bufmax += 25);
buf[(*buflen)++] = str_dup (tmp);
bytes = Context->hdrs[n]->content->length;
pfx);
if (*bufmax == *buflen)
- mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+ p_realloc(&buf, *bufmax += 25);
buf[(*buflen)++] = str_dup ("\n");
}
else
else {
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
- mem_realloc (&buf, sizeof (char *) * (bufmax += 25));
+ p_realloc(&buf, bufmax += 25);
buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
}