X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=002c063b70a8164a654e3335fba1b9b0ab6fa679;hp=0cb31c61735bfafc6e3d035ca8ecebd65099bf91;hb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e;hpb=c25bc063f35aaad6938c2022dae7a283346c2769

diff --git a/curs_lib.c b/curs_lib.c
index 0cb31c6..002c063 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -15,6 +15,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_menu.h"
@@ -22,9 +26,6 @@
 #include "pager.h"
 #include "mbyte.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <wchar.h>
@@ -201,14 +202,14 @@ int mutt_yesorno (const char *msg, int def)
    * ensure there is enough room for the answer and truncate the question
    * to fit.
    */
-  answer_string = mem_malloc (COLS + 1);
+  answer_string = p_new(char, COLS + 1);
   snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
             def == M_YES ? no : yes);
-  answer_string_len = str_len (answer_string);
+  answer_string_len = m_strlen(answer_string);
   printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
-  mem_free (&answer_string);
+  p_delete(&answer_string);
 
-  FOREVER {
+  for (;;) {
     mutt_refresh ();
     ch = mutt_getch ();
     if (CI_is_return (ch.ch))
@@ -419,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];
@@ -464,7 +465,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
     *redraw = REDRAW_FULL;
   }
   else {
-    char *pc = mem_malloc (str_len (prompt) + 3);
+    char *pc = p_new(char, m_strlen(prompt) + 3);
 
     sprintf (pc, "%s: ", prompt);       /* __SPRINTF_CHECKED__ */
     mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
@@ -474,7 +475,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
         != 0)
       buf[0] = 0;
     MAYBE_REDRAW (*redraw);
-    mem_free (&pc);
+    p_delete(&pc);
   }
 
   return 0;
@@ -488,7 +489,7 @@ void mutt_ungetch (int ch, int op)
   tmp.op = op;
 
   if (UngetCount >= UngetBufLen)
-    mem_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t));
+    p_realloc(&KeyEvent, UngetBufLen += 128);
 
   KeyEvent[UngetCount++] = tmp;
 }
@@ -529,7 +530,7 @@ int mutt_multi_choice (char *prompt, char *letters)
 
   mvaddstr (LINES - 1, 0, prompt);
   clrtoeol ();
-  FOREVER {
+  for (;;) {
     mutt_refresh ();
     ch = mutt_getch ();
     if (ch.ch == -1 || CI_is_return (ch.ch)) {
@@ -544,7 +545,7 @@ int mutt_multi_choice (char *prompt, char *letters)
       }
       else if (ch.ch <= '9' && ch.ch > '0') {
         choice = ch.ch - '0';
-        if (choice <= str_len (letters))
+        if (choice <= m_strlen(letters))
           break;
       }
     }
@@ -565,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 */
@@ -593,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) {
@@ -664,7 +665,7 @@ static void mutt_format_s_x (char *dest,
   }
 
   mutt_format_string (dest, destlen, min_width, max_width,
-                      right_justify, ' ', s, str_len (s), arboreal);
+                      right_justify, ' ', s, m_strlen(s), arboreal);
 }
 
 void mutt_format_s (char *dest,
@@ -689,10 +690,10 @@ void mutt_paddstr (int n, const char *s)
   wchar_t wc;
   int w;
   size_t k;
-  size_t len = str_len (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;
@@ -713,7 +714,7 @@ void mutt_paddstr (int n, const char *s)
 }
 
 /*
- * mutt_strwidth is like str_len except that it returns the width
+ * mutt_strwidth is like m_strlenexcept that it returns the width
  * refering to the number of characters cells.
  */
 
@@ -727,9 +728,9 @@ int mutt_strwidth (const char *s)
   if (!s)
     return 0;
 
-  n = str_len (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;