#endif
#include "mutt.h"
+#include "ascii.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
# include "mutt_ssl.h"
#endif
ret = 0;
}
- FREE (&c);
+ mem_free (&c);
return ret;
}
char *c;
if (!ascii_strncasecmp (line, "SASL", 4)) {
- FREE (&pop_data->auth_list);
+ mem_free (&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 = safe_malloc (strlen (line) + 1);
+ pop_data->auth_list = mem_malloc (strlen (line) + 1);
*pop_data->auth_list = '\0';
}
else {
- safe_realloc (&pop_data->auth_list,
+ 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;
- FREE (&pop_data->auth_list);
+ mem_free (&pop_data->auth_list);
}
/* Execute CAPA command */
pop_data->cmd_capa = CMD_AVAILABLE;
break;
}
+ case PFD_FUNCT_ERROR:
case PQ_ERR:
{
pop_data->cmd_capa = CMD_NOT_AVAILABLE;
if (ret != PQ_OK)
return ret;
- inbuf = safe_malloc (sizeof (buf));
+ inbuf = mem_malloc (sizeof (buf));
FOREVER {
chunk =
lenbuf = 0;
}
- safe_realloc (&inbuf, lenbuf + sizeof (buf));
+ mem_realloc (&inbuf, lenbuf + sizeof (buf));
}
- FREE (&inbuf);
+ mem_free (&inbuf);
return ret;
}