#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mutt_ssl.h"
-#include "mutt_regex.h"
+
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+#include "lib/rx.h"
typedef struct _tlssockdata {
gnutls_session state;
gnutls_certificate_free_credentials (data->xcred);
gnutls_deinit (data->state);
- safe_free ((void **) &conn->sockdata);
+ FREE(&conn->sockdata);
}
return raw_socket_close (conn);
if (regexec (&preg, linestr, 3, pmatch, 0) == 0) {
linestr[pmatch[1].rm_eo] = '\0';
linestr[pmatch[2].rm_eo] = '\0';
- if (strcmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
- strcmp (linestr + pmatch[2].rm_so, buf) == 0) {
+ if (safe_strcmp (linestr + pmatch[1].rm_so, hostname) == 0 &&
+ safe_strcmp (linestr + pmatch[2].rm_so, buf) == 0) {
regfree (&preg);
- safe_free ((void **) &linestr);
+ FREE(&linestr);
fclose (fp);
return 1;
}