X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=ceab41b4062cbe002c909fa67f31935d14f2af1b;hp=41da0e75908f9ffe5f91c1acc6370c35ee1c0299;hb=d9960a434f5c00a534a0dabe02ae5ab8d4881569;hpb=4711a1a970ba7dda6eaf71f16fdfd74f90d02bb8

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 41da0e7..ceab41b 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -14,13 +14,14 @@
 #include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "enter.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
 #include <openssl/ssl.h>
@@ -333,8 +334,8 @@ int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
 
   /* Create hostname:port string and tell libesmtp */
   /* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */
-  hostportlen = str_len (SmtpHost) + 7;
-  hostportstr = mem_malloc (hostportlen);
+  hostportlen = m_strlen(SmtpHost) + 7;
+  hostportstr = p_new(char, hostportlen);
   snprintf (hostportstr, hostportlen, "%s:%d", SmtpHost, SmtpPort);
   if (!smtp_set_server (session, hostportstr))
     SMTPFAIL ("smtp_set_server");
@@ -397,7 +398,7 @@ Done:
   if (fp != NULL)
     fclose (fp);
   if (hostportstr != NULL)
-    free (hostportstr);
+    p_delete(&hostportstr);
   if (session != NULL)
     smtp_destroy_session (session);
   if (authctx != NULL)