X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=dcbe1ee6039acc6ebc4797f223622229db3d30e3;hp=35d71b9900b80a0db80f6237b933a5546041e347;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=308c7080ccca40d4865d8810f5528331d9ed61ff

diff --git a/charset.c b/charset.c
index 35d71b9..dcbe1ee 100644
--- a/charset.c
+++ b/charset.c
@@ -23,13 +23,13 @@
 #include <errno.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "charset.h"
 #include "ascii.h"
 
-#include "lib/str.h"
 
 #ifndef EILSEQ
 # define EILSEQ EINVAL
@@ -197,15 +197,15 @@ void mutt_set_langinfo_charset (void)
   mutt_canonical_charset (buff2, sizeof (buff2), buff);
 
   /* finally, set $charset */
-  if (!(Charset = str_dup (buff2)))
-    Charset = str_dup ("iso-8859-1");
+  if (!(Charset = m_strdup(buff2)))
+    Charset = m_strdup("iso-8859-1");
 }
 
 #else
 
 void mutt_set_langinfo_charset (void)
 {
-  Charset = str_dup ("iso-8859-1");
+  Charset = m_strdup("iso-8859-1");
 }
 
 #endif
@@ -316,7 +316,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
 
         for (t = inrepls; *t; t++) {
           const char *ib1 = *t;
-          size_t ibl1 = str_len (*t);
+          size_t ibl1 = m_strlen(*t);
           char *ob1 = ob;
           size_t obl1 = obl;
 
@@ -336,7 +336,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
         outrepl = "?";
       my_iconv(cd, 0, 0, &ob, &obl);
       if (obl) {
-        int n = str_len (outrepl);
+        int n = m_strlen(outrepl);
 
         if (n > obl) {
           outrepl = "?";
@@ -387,7 +387,7 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
     else
       outrepl = "?";
 
-    len = str_len (s);
+    len = m_strlen(s);
     ib = s, ibl = len + 1;
     obl = MB_LEN_MAX * ibl;
     ob = buf = xmalloc(obl + 1);
@@ -542,7 +542,7 @@ const char *mutt_get_first_charset (const char *charset)
   const char *c, *c1;
 
   c = charset;
-  if (!str_len (c))
+  if (!m_strlen(c))
     return "us-ascii";
   if (!(c1 = strchr (c, ':')))
     return ((char*) charset);
@@ -592,14 +592,14 @@ int mutt_convert_nonmime_string (char **ps)
     char *s = NULL;
     char *fromcode;
     size_t m, n;
-    size_t ulen = str_len (*ps);
+    size_t ulen = m_strlen(*ps);
     size_t slen;
 
     if (!u || !*u)
       return 0;
 
     c1 = strchr (c, ':');
-    n = c1 ? c1 - c : str_len (c);
+    n = c1 ? c1 - c : m_strlen(c);
     if (!n)
       continue;
     fromcode = p_dupstr(c, n);