projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move buffer.[hc] into lib-lib/
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
d8f2baf
..
52547de
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-12,6
+12,8
@@
#endif
#include <lib-lib/mem.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.h"
#include "enter.h"
@@
-24,9
+26,6
@@
#include "imap.h"
#endif
#include "imap.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
@@
-39,10
+38,10
@@
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
wchar_t wc;
size_t k;
{
wchar_t wc;
size_t k;
- size_t n =
str_len
((char *) s);
+ size_t n =
m_strlen
((char *) s);
mbstate_t mbstate;
mbstate_t mbstate;
-
memset (&mbstate, 0, sizeof (mbstate)
);
+
p_clear(&mbstate, 1
);
while (*s) {
if (*s < M_TREE_MAX) {
if (do_color)
while (*s) {
if (*s < M_TREE_MAX) {
if (do_color)
@@
-158,7
+157,7
@@
void menu_pad_string (char *s, size_t n)
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s,
str_len
(s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s,
m_strlen
(s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
p_delete(&tmpbuf);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
p_delete(&tmpbuf);
@@
-644,7
+643,7
@@
static int menu_search_generic (MUTTMENU * m, regex_t * re, int n)
MUTTMENU *mutt_new_menu (void)
{
MUTTMENU *mutt_new_menu (void)
{
- MUTTMENU *p =
(MUTTMENU *) mem_calloc (1, sizeof (MUTTMENU)
);
+ MUTTMENU *p =
p_new(MUTTMENU, 1
);
p->current = 0;
p->top = 0;
p->current = 0;
p->top = 0;