X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=4203b0ee7a5d2686943e893c6fd19bcfc5f07768;hp=80c81dd6888f1a533252e70f3f2bb3e5d4ce97bd;hb=0c12d960399d14b4143b2bb91a96bdaca64e4c56;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/curs_lib.c b/curs_lib.c
index 80c81dd..4203b0e 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -420,7 +420,7 @@ int mutt_do_pager (const char *banner,
 {
   int rc;
 
-  if (!Pager || str_cmp (Pager, "builtin") == 0)
+  if (!Pager || m_strcmp(Pager, "builtin") == 0)
     rc = mutt_pager (banner, tempfile, do_color, info);
   else {
     char cmd[STRING];
@@ -566,7 +566,7 @@ int mutt_addwch (wchar_t wc)
   mbstate_t mbstate;
   size_t n1, n2;
 
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
   if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) ||
       (n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1))
     return -1;                  /* ERR */
@@ -594,8 +594,8 @@ void mutt_format_string (char *dest, size_t destlen,
   char scratch[MB_LEN_MAX];
   mbstate_t mbstate1, mbstate2;
 
-  memset (&mbstate1, 0, sizeof (mbstate1));
-  memset (&mbstate2, 0, sizeof (mbstate2));
+  p_clear(&mbstate1, 1);
+  p_clear(&mbstate2, 1);
   --destlen;
   p = dest;
   for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
@@ -693,7 +693,7 @@ void mutt_paddstr (int n, const char *s)
   size_t len = m_strlen(s);
   mbstate_t mbstate;
 
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
   for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
     if (k == (size_t) (-1) || k == (size_t) (-2)) {
       k = (k == (size_t) (-1)) ? 1 : len;
@@ -730,7 +730,7 @@ int mutt_strwidth (const char *s)
 
   n = m_strlen(s);
 
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
   for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
     if (k == (size_t) (-1) || k == (size_t) (-2)) {
       k = (k == (size_t) (-1)) ? 1 : n;