X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbyte.c;h=6c9a76c96613a079ff63f939775baf0131930015;hp=6993422eaf29412cba2cc92b4534edfb0c7043b7;hb=2a06362a155582cd59ae2ef6f0df71694a7eede3;hpb=59926571aaec3e38cec09d0d9fa34f4a4b887309

diff --git a/mbyte.c b/mbyte.c
index 6993422..6c9a76c 100644
--- a/mbyte.c
+++ b/mbyte.c
@@ -15,11 +15,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mbyte.h"
 #include "charset.h"
 
-#include "lib/intl.h"
 
 #include <errno.h>
 
@@ -102,14 +103,14 @@ static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd)
     ib = buf;
     ob = s;
     obl = MB_LEN_MAX;
-    r = iconv (cd, &ib, &ibl, &ob, &obl);
+    r = my_iconv(cd, &ib, &ibl, &ob, &obl);
   }
   else {
     ib = "";
     ibl = 1;
     ob = buf;
     obl = sizeof (buf);
-    r = iconv (cd, &ib, &ibl, &ob, &obl);
+    r = my_iconv(cd, &ib, &ibl, &ob, &obl);
   }
   return ob - s;
 }
@@ -168,10 +169,10 @@ size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n,
   ibl = 1;
 
   for (;;) {
-    r = iconv (cd, &ib, &ibl, &ob, &obl);
+    r = my_iconv(cd, &ib, &ibl, &ob, &obl);
     if (ob > bufo && (!k || ib > bufi + k)) {
       /* we have a character */
-      memset (ps, 0, sizeof (*ps));
+      p_clear(ps, 1);
       utf8rtowc (pwc, bufo, ob - bufo, &mbstate);
       return (pwc && *pwc) ? (ib - (k ? bufi + k : s)) : 0;
     }
@@ -188,7 +189,7 @@ size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n,
       }
       else {
         /* save the state and give up */
-        memset (ps, 0, sizeof (*ps));
+        p_clear(ps, 1);
         if (ibl <= sizeof (mbstate_t))  /* need extra condition here! */
           memcpy (ps, ib, ibl);
         return (size_t) (-2);
@@ -215,7 +216,7 @@ size_t mbrtowc (wchar_t * pwc, const char *s, size_t n, mbstate_t * ps)
     return mbrtowc_iconv (pwc, s, n, ps, charset_to_utf8);
   else {
     if (!s) {
-      memset (ps, 0, sizeof (*ps));
+      p_clear(ps, 1);
       return 0;
     }
     if (!n)