#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
- mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[n].syntax), 1);
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
- mem_realloc (&(lineInfo[n].syntax),
- (lineInfo[n].chunks) *
- sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks);
}
i = lineInfo[n].chunks - 1;
pmatch[0].rm_so += offset;
}
if (*last == *max) {
- mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
+ p_realloc(lineInfo, *max += LINES);
for (ch = *last; ch < *max; ch++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -1;
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
- mem_realloc (&((*lineInfo)[n].search),
- ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
+ p_realloc(&(*lineInfo)[n].search, (*lineInfo)[n].search_cnt);
else
(*lineInfo)[n].search = p_new(struct syntax_t, 1);
pmatch[0].rm_so += offset;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ p_realloc(&lineInfo[i].syntax, 1);
if (SearchCompiled && lineInfo[i].search)
p_delete(&(lineInfo[i].search));
}
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
- mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[i].syntax), 1);
if (SearchCompiled && lineInfo[i].search)
p_delete(&(lineInfo[i].search));
}