# 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"
#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>
* 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 {
mutt_refresh ();
*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);
!= 0)
buf[0] = 0;
MAYBE_REDRAW (*redraw);
- mem_free (&pc);
+ p_delete(&pc);
}
return 0;
tmp.op = op;
if (UngetCount >= UngetBufLen)
- mem_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t));
+ p_realloc(&KeyEvent, UngetBufLen += 128);
KeyEvent[UngetCount++] = tmp;
}
}
else if (ch.ch <= '9' && ch.ch > '0') {
choice = ch.ch - '0';
- if (choice <= str_len (letters))
+ if (choice <= m_strlen(letters))
break;
}
}
}
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,
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));
}
/*
- * 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.
*/
if (!s)
return 0;
- n = str_len (s);
+ n = m_strlen(s);
memset (&mbstate, 0, sizeof (mbstate));
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {