projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
783ee59
..
70b31ac
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-16,6
+16,7
@@
#endif
#include "mutt.h"
#endif
#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"
@@
-100,7
+101,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
+111,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
mem
_calloc (1, sizeof (REMAILER));
}
static void mix_free_remailer (REMAILER ** r)
{
}
static void mix_free_remailer (REMAILER ** r)
{
-
FREE
(&(*r)->shortname);
-
FREE
(&(*r)->addr);
-
FREE
(&(*r)->ver);
+
mem_free
(&(*r)->shortname);
+
mem_free
(&(*r)->addr);
+
mem_free
(&(*r)->ver);
-
FREE
(r);
+
mem_free
(r);
}
/* parse the type2.list as given by mixmaster -T */
}
/* parse the type2.list as given by mixmaster -T */
@@
-209,7
+210,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);
+
mem_free
(type2_list);
}
}
@@
-228,7
+229,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;
@@
-490,7
+491,7
@@
void mix_make_chain (LIST ** chainp, int *redraw)
*redraw = REDRAW_FULL;
*redraw = REDRAW_FULL;
- chain =
safe
_calloc (sizeof (MIXCHAIN), 1);
+ chain =
mem
_calloc (sizeof (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
+658,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);
+
mem_free
(&coords);
+
mem_free
(&chain);
}
/* some safety checks before piping the message to mixmaster */
}
/* some safety checks before piping the message to mixmaster */