X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=url.c;h=8c49fd0d7e7cf8e8280a2e60fa82336a5cc4f433;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hp=9062dce90423611d623863e28147bf6436ddf520;hpb=617e7d83d14e14e6a520a48e75437211b16c8834;p=apps%2Fmadmutt.git

diff --git a/url.c b/url.c
index 9062dce..8c49fd0 100644
--- a/url.c
+++ b/url.c
@@ -16,9 +16,9 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "mapping.h"
 #include "url.h"
 
@@ -174,7 +174,7 @@ int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
 
   if (ciss->host) {
     str_cat (dest, len, "//");
-    len -= (l = str_len (dest));
+    len -= (l = m_strlen(dest));
     dest += l;
 
     if (ciss->user) {
@@ -183,7 +183,7 @@ int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
       else
         snprintf (dest, len, "%s@", ciss->user);
 
-      len -= (l = str_len (dest));
+      len -= (l = m_strlen(dest));
       dest += l;
     }
 
@@ -214,7 +214,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
   if (!(t = strchr (src, ':')))
     return -1;
 
-  if ((tmp = str_dup (t + 1)) == NULL)
+  if ((tmp = m_strdup(t + 1)) == NULL)
     return -1;
 
   if ((headers = strchr (tmp, '?')))
@@ -240,7 +240,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
     }
     else {
 #define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
-      taglen = str_len (tag) + str_len (SAFEPFX);
+      taglen = m_strlen(tag) + m_strlen(SAFEPFX);
       /* mutt_parse_rfc822_line makes some assumptions */
       snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
 #undef SAVEPFX