#include <string.h>
#include <ctype.h>
+#include <lib-lib/mem.h>
+
#include "buffer.h"
#include "lib/mem.h"
* Disregards the 'destroy' flag, which seems reserved for caller.
* This is bad, but there's no apparent protocol for it.
*/
-BUFFER *mutt_buffer_init (BUFFER * b)
+BUFFER *mutt_buffer_init(BUFFER *b)
{
if (!b) {
- b = mem_malloc (sizeof (BUFFER));
+ b = p_new(BUFFER, 1);
if (!b)
return NULL;
}
else {
- mem_free(&b->data);
+ p_delete(&b->data);
}
memset (b, 0, sizeof (BUFFER));
return b;
* Disregards the 'destroy' flag, which seems reserved for caller.
* This is bad, but there's no apparent protocol for it.
*/
-BUFFER *mutt_buffer_from (BUFFER * b, char *seed)
+BUFFER *mutt_buffer_from (BUFFER * b, const char *seed)
{
if (!seed)
return NULL;
if (!p || !*p)
return;
- mem_free (&(*p)->data);
+ p_delete(&(*p)->data);
/* dptr is just an offset to data and shouldn't be freed */
- mem_free (p);
+ p_delete(p);
}
/* dynamically grows a BUFFER to accomodate s, in increments of 128 bytes.
cmd = str_substrdup (tok->dptr, pc);
if ((pid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
debug_print (1, ("unable to fork command: %s\n", cmd));
- mem_free (&cmd);
+ p_delete(&cmd);
return (-1);
}
- mem_free (&cmd);
+ p_delete(&cmd);
tok->dptr = pc + 1;
* the token */
if (expn.data && qc) {
mutt_buffer_addstr (dest, expn.data);
- mem_free (&expn.data);
+ p_delete(&expn.data);
}
else if (expn.data) {
expnlen = str_len (expn.data);
tok->dsize = expnlen + str_len (tok->dptr) + 1;
- ptr = mem_malloc (tok->dsize);
+ ptr = xmalloc(tok->dsize);
memcpy (ptr, expn.data, expnlen);
strcpy (ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */
if (tok->destroy)
- mem_free (&tok->data);
+ p_delete(&tok->data);
tok->data = ptr;
tok->dptr = ptr;
tok->destroy = 1; /* mark that the caller should destroy this data */
ptr = NULL;
- mem_free (&expn.data);
+ p_delete(&expn.data);
}
}
else if (ch == '$' && (!qc || qc == '"')
(mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp)))
mutt_buffer_addstr (dest, env);
}
- mem_free (&var);
+ p_delete(&var);
}
else
mutt_buffer_addch (dest, ch);