projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem_calloc -> p_new
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
783ee59
..
6181c73
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-15,7
+15,10
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "mutt.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mapping.h"
@@
-35,6
+38,8
@@
#include <sys/file.h>
#include <fcntl.h>
#include <sys/file.h>
#include <fcntl.h>
+#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
+
#ifdef MIXMASTER
struct coord {
#ifdef MIXMASTER
struct coord {
@@
-100,7
+105,7
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
{
if (*used == *slots) {
*slots += 5;
{
if (*used == *slots) {
*slots += 5;
-
safe
_realloc (type2_list, sizeof (REMAILER *) * (*slots));
+
mem
_realloc (type2_list, sizeof (REMAILER *) * (*slots));
}
(*type2_list)[(*used)++] = entry;
}
(*type2_list)[(*used)++] = entry;
@@
-110,16
+115,16
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
static REMAILER *mix_new_remailer (void)
{
static REMAILER *mix_new_remailer (void)
{
- return
safe_calloc (1, sizeof (REMAILER)
);
+ return
p_new(REMAILER, 1
);
}
static void mix_free_remailer (REMAILER ** r)
{
}
static void mix_free_remailer (REMAILER ** r)
{
-
FREE
(&(*r)->shortname);
-
FREE
(&(*r)->addr);
-
FREE
(&(*r)->ver);
+
p_delete
(&(*r)->shortname);
+
p_delete
(&(*r)->addr);
+
p_delete
(&(*r)->ver);
-
FREE
(r);
+
p_delete
(r);
}
/* parse the type2.list as given by mixmaster -T */
}
/* parse the type2.list as given by mixmaster -T */
@@
-209,7
+214,7
@@
static void mix_free_type2_list (REMAILER *** ttlp)
for (i = 0; type2_list[i]; i++)
mix_free_remailer (&type2_list[i]);
for (i = 0; type2_list[i]; i++)
mix_free_remailer (&type2_list[i]);
-
FREE
(type2_list);
+
p_delete
(type2_list);
}
}
@@
-228,7
+233,7
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
if (!chain->cl)
return;
if (!chain->cl)
return;
-
safe
_realloc (coordsp, sizeof (struct coord) * chain->cl);
+
mem
_realloc (coordsp, sizeof (struct coord) * chain->cl);
coords = *coordsp;
coords = *coordsp;
@@
-418,8
+423,9
@@
static const char *mix_entry_fmt (char *dest,
static void mix_entry (char *b, size_t blen, MUTTMENU * menu, int num)
{
REMAILER **type2_list = (REMAILER **) menu->data;
static void mix_entry (char *b, size_t blen, MUTTMENU * menu, int num)
{
REMAILER **type2_list = (REMAILER **) menu->data;
+ int w=(COLS-SW)>blen?blen:(COLS-SW);
- mutt_FormatString (b,
blen
, NONULL (MixEntryFormat), mix_entry_fmt,
+ mutt_FormatString (b,
w
, NONULL (MixEntryFormat), mix_entry_fmt,
(unsigned long) type2_list[num], M_FORMAT_ARROWCURSOR);
}
(unsigned long) type2_list[num], M_FORMAT_ARROWCURSOR);
}
@@
-480,7
+486,7
@@
void mix_make_chain (LIST ** chainp, int *redraw)
int op;
int i, j;
int op;
int i, j;
- char *t;
+ c
onst c
har *t;
if (!(type2_list = mix_type2_list (&ttll))) {
mutt_error _("Can't get mixmaster's type2.list!");
if (!(type2_list = mix_type2_list (&ttll))) {
mutt_error _("Can't get mixmaster's type2.list!");
@@
-490,7
+496,7
@@
void mix_make_chain (LIST ** chainp, int *redraw)
*redraw = REDRAW_FULL;
*redraw = REDRAW_FULL;
- chain =
safe_calloc (sizeof (MIXCHAIN)
, 1);
+ chain =
p_new(MIXCHAIN
, 1);
for (p = *chainp; p; p = p->next)
mix_chain_add (chain, (char *) p->data, type2_list);
for (p = *chainp; p; p = p->next)
mix_chain_add (chain, (char *) p->data, type2_list);
@@
-657,8
+663,8
@@
void mix_make_chain (LIST ** chainp, int *redraw)
}
mix_free_type2_list (&type2_list);
}
mix_free_type2_list (&type2_list);
-
FREE
(&coords);
-
FREE
(&chain);
+
p_delete
(&coords);
+
p_delete
(&chain);
}
/* some safety checks before piping the message to mixmaster */
}
/* some safety checks before piping the message to mixmaster */