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

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 41da0e7..f51bd2e 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>
@@ -94,7 +95,7 @@ static void _mutt_libesmtp_perror (const char *msg)
  *   Very similar to sendlib.c::add_args
  */
 static int
-_mutt_libesmtp_add_recipients (smtp_message_t message, ADDRESS * addr)
+_mutt_libesmtp_add_recipients (smtp_message_t message, address_t * addr)
 {
   int ret = 0;
 
@@ -287,8 +288,8 @@ int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
   char* val = (char*) p;
   if (!val || !*val)
     return (1);
-  if (str_ncmp (val, "enabled", 7) != 0 &&
-      str_ncmp (val, "required", 8) != 0) {
+  if (m_strncmp(val, "enabled", 7) != 0 &&
+      m_strncmp(val, "required", 8) != 0) {
     if (errbuf)
       snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option);
     return (0);
@@ -303,8 +304,8 @@ int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
  *   Returns 0 upon success, -1 upon failure (and prints an error
  *   message).
  */
-int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
-                          ADDRESS * to, ADDRESS * cc, ADDRESS * bcc,    /* recips */
+int mutt_libesmtp_invoke (address_t * from,       /* the sender */
+                          address_t * to, address_t * cc, address_t * bcc,    /* recips */
                           const char *msg,      /* file containing message */
                           int eightbit)
 {                               /* message contains 8bit chars */
@@ -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)