# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "mime.h"
p->attribute = NULL;
p->value = NULL;
- mem_free (&p);
+ p_delete(&p);
rfc2231_list_insert (&conthead, conttmp);
}
static struct rfc2231_parameter *rfc2231_new_parameter (void)
{
- return mem_calloc (sizeof (struct rfc2231_parameter), 1);
+ return p_new(struct rfc2231_parameter, 1);
}
static void rfc2231_free_parameter (struct rfc2231_parameter **p)
{
if (*p) {
- mem_free (&(*p)->attribute);
- mem_free (&(*p)->value);
- mem_free (p);
+ p_delete(&(*p)->attribute);
+ p_delete(&(*p)->value);
+ p_delete(p);
}
}
++ext;
if (encode) {
- e = mem_malloc (dlen + 2 * ext + str_len (charset) + 3);
+ e = p_new(char, dlen + 2 * ext + str_len(charset) + 3);
sprintf (e, "%s''", charset); /* __SPRINTF_CHECKED__ */
t = e + str_len (e);
for (s = d, slen = dlen; slen; s++, slen--)
*t = '\0';
if (d != *pd)
- mem_free (&d);
- mem_free (pd);
+ p_delete(&d);
+ p_delete(pd);
*pd = e;
}
else if (d != *pd) {
- mem_free (pd);
+ p_delete(pd);
*pd = d;
}
- mem_free (&charset);
+ p_delete(&charset);
return encode;
}