# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "mx.h"
ret = 0;
}
- mem_free (&c);
+ p_delete(&c);
return ret;
}
char *c;
if (!ascii_strncasecmp (line, "SASL", 4)) {
- mem_free (&pop_data->auth_list);
+ p_delete(&pop_data->auth_list);
c = line + 4;
SKIPWS (c);
pop_data->auth_list = str_dup (c);
POP_DATA *pop_data = (POP_DATA *) data;
if (!pop_data->auth_list) {
- pop_data->auth_list = mem_malloc (strlen (line) + 1);
- *pop_data->auth_list = '\0';
- }
- else {
+ pop_data->auth_list = p_new(char, strlen(line) + 1);
+ } else {
mem_realloc (&pop_data->auth_list,
strlen (pop_data->auth_list) + strlen (line) + 2);
strcat (pop_data->auth_list, " "); /* __STRCAT_CHECKED__ */
pop_data->resp_codes = 0;
pop_data->expire = 1;
pop_data->login_delay = 0;
- mem_free (&pop_data->auth_list);
+ p_delete(&pop_data->auth_list);
}
/* Execute CAPA command */
* -1 - conection lost,
* -2 - invalid command or execution error.
*/
-pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, char *msg)
+pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg)
{
int dbg = M_SOCK_LOG_CMD;
char *c;
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data)
*/
-pop_query_status pop_fetch_data (POP_DATA * pop_data, char *query, progress_t* bar,
+pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progress_t* bar,
int (*funct) (char *, void *), void *data)
{
char buf[LONG_STRING];
if (ret != PQ_OK)
return ret;
- inbuf = mem_malloc (sizeof (buf));
+ inbuf = p_new(char, sizeof(buf));
FOREVER {
chunk =
mem_realloc (&inbuf, lenbuf + sizeof (buf));
}
- mem_free (&inbuf);
+ p_delete(&inbuf);
return ret;
}
for (i = 0; i < ctx->msgcount; i++)
ctx->hdrs[i]->refno = -1;
- ret = pop_fetch_data (pop_data, "UIDL\r\n", &bar, check_uidl, ctx);
+ ret = pop_fetch_data(pop_data, "UIDL\r\n", &bar, check_uidl, ctx);
if (ret == PQ_ERR) {
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);