#include "pgp.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/str.h"
#include "lib/debug.h"
rewind (fp);
memset (&h, 0, sizeof (h));
- h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ h.data = p_new(IMAP_HEADER_DATA, 1);
do {
mfhrc = 0;
/* freshen fp, h */
rewind (fp);
memset (&h, 0, sizeof (h));
- h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ h.data = p_new(IMAP_HEADER_DATA, 1);
/* this DO loop does two things:
* 1. handles untagged messages, so we can try again on the same msg
unsigned char readonly;
memset (&newh, 0, sizeof (newh));
- newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+ newh.data = p_new(IMAP_HEADER_DATA, 1);
debug_print (2, ("parsing FLAGS\n"));
if ((s = msg_parse_flags (&newh, s)) == NULL) {