use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / mutt_sasl.c

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 5bc1b70..15f8c0e 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -116,7 +116,7 @@ static int iptostring (const struct sockaddr *addr, socklen_t addrlen,
   if (ret)
     return getnameinfo_err (ret);
 
-  if (outlen < str_len (hbuf) + str_len (pbuf) + 2)
+  if (outlen < m_strlen(hbuf) + m_strlen(pbuf) + 2)
     return SASL_BUFOVER;
 
   snprintf (out, outlen, "%s;%s", hbuf, pbuf);
@@ -331,7 +331,7 @@ int mutt_sasl_interact (sasl_interact_t * interaction)
     if (mutt_get_field (prompt, resp, sizeof (resp), 0))
       return SASL_FAIL;
 
-    interaction->len = str_len (resp) + 1;
+    interaction->len = m_strlen(resp) + 1;
     interaction->result = p_dupstr(resp, interaction->len - 1);
     interaction++;
   }
@@ -429,7 +429,7 @@ static int mutt_sasl_cb_authname (void *context, int id, const char **result,
   }
 
   if (len)
-    *len = str_len (*result);
+    *len = m_strlen(*result);
 
   return SASL_OK;
 }
@@ -449,7 +449,7 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id,
   if (mutt_account_getpass (account))
     return SASL_FAIL;
 
-  len = str_len (account->pass);
+  len = m_strlen(account->pass);
 
   *psecret = xmalloc(sizeof(sasl_secret_t) + len);
   (*psecret)->len = len;