projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move hash.[hc] into lib-lib/
[apps/madmutt.git]
/
curs_main.c
diff --git
a/curs_main.c
b/curs_main.c
index
0278069
..
fe65287
100644
(file)
--- a/
curs_main.c
+++ b/
curs_main.c
@@
-14,6
+14,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
@@
-45,9
+49,6
@@
#include "mutt_sasl.h"
#endif
#include "mutt_sasl.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-298,9
+299,7
@@
static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
/* save the list of new messages */
if (oldcount && check != M_REOPENED && ((Sort & SORT_MASK) == SORT_THREADS)) {
/* save the list of new messages */
if (oldcount && check != M_REOPENED && ((Sort & SORT_MASK) == SORT_THREADS)) {
- save_new =
- (HEADER **) mem_malloc (sizeof (HEADER *) *
- (Context->msgcount - oldcount));
+ save_new = p_new(HEADER*, Context->msgcount - oldcount);
for (j = oldcount; j < Context->msgcount; j++)
save_new[j - oldcount] = Context->hdrs[j];
}
for (j = oldcount; j < Context->msgcount; j++)
save_new[j - oldcount] = Context->hdrs[j];
}
@@
-332,7
+331,7
@@
static void update_index (MUTTMENU * menu, CONTEXT * ctx, int check,
mutt_uncollapse_thread (Context, h);
}
}
mutt_uncollapse_thread (Context, h);
}
}
-
mem_free
(&save_new);
+
p_delete
(&save_new);
mutt_set_virtual (Context);
}
}
mutt_set_virtual (Context);
}
}
@@
-386,7
+385,7
@@
struct mapping_t IndexHelp[] = {
{N_("Reply"), OP_REPLY},
{N_("Group"), OP_GROUP_REPLY},
{N_("Help"), OP_HELP},
{N_("Reply"), OP_REPLY},
{N_("Group"), OP_GROUP_REPLY},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL
, OP_NULL
}
};
#ifdef USE_NNTP
};
#ifdef USE_NNTP
@@
-399,7
+398,7
@@
struct mapping_t IndexNewsHelp[] = {
{N_("Followup"), OP_FOLLOWUP},
{N_("Catchup"), OP_CATCHUP},
{N_("Help"), OP_HELP},
{N_("Followup"), OP_FOLLOWUP},
{N_("Catchup"), OP_CATCHUP},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL
, OP_NULL
}
};
#endif
};
#endif
@@
-484,7
+483,7
@@
int mutt_index_menu (void)
if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0) {
if (!Context->path) {
/* fatal error occurred */
if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0) {
if (!Context->path) {
/* fatal error occurred */
-
mem_free
(&Context);
+
p_delete
(&Context);
menu->redraw = REDRAW_FULL;
}
set_option (OPTSEARCHINVALID);
menu->redraw = REDRAW_FULL;
}
set_option (OPTSEARCHINVALID);
@@
-966,8
+965,8
@@
int mutt_index_menu (void)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
}
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
}
-
mem_free
(&Context->pattern);
- Context->pattern =
str_dup
(buf);
+
p_delete
(&Context->pattern);
+ Context->pattern =
m_strdup
(buf);
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
@@
-1154,7
+1153,7
@@
int mutt_index_menu (void)
/* check for a fatal error, or all messages deleted */
if (!Context->path)
/* check for a fatal error, or all messages deleted */
if (!Context->path)
-
mem_free
(&Context);
+
p_delete
(&Context);
/* if we were in the pager, redisplay the message */
if (menu->menu == MENU_PAGER) {
/* if we were in the pager, redisplay the message */
if (menu->menu == MENU_PAGER) {
@@
-1257,7
+1256,7
@@
int mutt_index_menu (void)
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
break;
}
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
break;
}
-
mem_free
(&Context);
+
p_delete
(&Context);
}
mutt_sleep (0);
}
mutt_sleep (0);
@@
-1340,7
+1339,7
@@
int mutt_index_menu (void)
{
if (Context) {
mx_fastclose_mailbox (Context);
{
if (Context) {
mx_fastclose_mailbox (Context);
-
mem_free
(&Context);
+
p_delete
(&Context);
}
done = 1;
}
}
done = 1;
}