#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/intl.h"
-#include "lib/str.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
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);
/* Create hostname:port string and tell libesmtp */
/* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */
- hostportlen = str_len (SmtpHost) + 7;
+ hostportlen = m_strlen(SmtpHost) + 7;
hostportstr = p_new(char, hostportlen);
snprintf (hostportstr, hostportlen, "%s:%d", SmtpHost, SmtpPort);
if (!smtp_set_server (session, hostportstr))