projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ascii.* into the lib-lib.
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
8f934b4
..
cbefd24
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-15,6
+15,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 "recvattach.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "recvattach.h"
#include "mutt_curses.h"
@@
-23,9
+27,6
@@
#include "remailer.h"
#include "remailer.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include <stdio.h>
#include "lib/rx.h"
#include <stdio.h>
@@
-103,7
+104,7
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
{
if (*used == *slots) {
*slots += 5;
{
if (*used == *slots) {
*slots += 5;
-
mem_realloc (type2_list, sizeof (REMAILER *) * (*slots)
);
+
p_realloc(type2_list, *slots
);
}
(*type2_list)[(*used)++] = entry;
}
(*type2_list)[(*used)++] = entry;
@@
-113,16
+114,16
@@
static void mix_add_entry (REMAILER *** type2_list, REMAILER * entry,
static REMAILER *mix_new_remailer (void)
{
static REMAILER *mix_new_remailer (void)
{
- return
mem_calloc (1, sizeof (REMAILER)
);
+ return
p_new(REMAILER, 1
);
}
static void mix_free_remailer (REMAILER ** r)
{
}
static void mix_free_remailer (REMAILER ** r)
{
-
mem_free
(&(*r)->shortname);
-
mem_free
(&(*r)->addr);
-
mem_free
(&(*r)->ver);
+
p_delete
(&(*r)->shortname);
+
p_delete
(&(*r)->addr);
+
p_delete
(&(*r)->ver);
-
mem_free
(r);
+
p_delete
(r);
}
/* parse the type2.list as given by mixmaster -T */
}
/* parse the type2.list as given by mixmaster -T */
@@
-158,7
+159,7
@@
static REMAILER **mix_type2_list (size_t * l)
/* first, generate the "random" remailer */
p = mix_new_remailer ();
/* first, generate the "random" remailer */
p = mix_new_remailer ();
- p->shortname =
str_dup
("<random>");
+ p->shortname =
m_strdup
("<random>");
mix_add_entry (&type2_list, p, &slots, &used);
while (fgets (line, sizeof (line), fp)) {
mix_add_entry (&type2_list, p, &slots, &used);
while (fgets (line, sizeof (line), fp)) {
@@
-167,12
+168,12
@@
static REMAILER **mix_type2_list (size_t * l)
if (!(t = strtok (line, " \t\n")))
goto problem;
if (!(t = strtok (line, " \t\n")))
goto problem;
- p->shortname =
str_dup
(t);
+ p->shortname =
m_strdup
(t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
- p->addr =
str_dup
(t);
+ p->addr =
m_strdup
(t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
@@
-180,7
+181,7
@@
static REMAILER **mix_type2_list (size_t * l)
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
- p->ver =
str_dup
(t);
+ p->ver =
m_strdup
(t);
if (!(t = strtok (NULL, " \t\n")))
goto problem;
if (!(t = strtok (NULL, " \t\n")))
goto problem;
@@
-212,7
+213,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]);
-
mem_free
(type2_list);
+
p_delete
(type2_list);
}
}
@@
-231,13
+232,13
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
if (!chain->cl)
return;
if (!chain->cl)
return;
-
mem_realloc (coordsp, sizeof (struct coord) *
chain->cl);
+
p_realloc(coordsp,
chain->cl);
coords = *coordsp;
if (i) {
c =
coords = *coordsp;
if (i) {
c =
- coords[i - 1].c +
str_len
(type2_list[chain->ch[i - 1]]->shortname) + 2;
+ coords[i - 1].c +
m_strlen
(type2_list[chain->ch[i - 1]]->shortname) + 2;
r = coords[i - 1].r;
}
else {
r = coords[i - 1].r;
}
else {
@@
-248,7
+249,7
@@
static void mix_screen_coordinates (REMAILER ** type2_list,
for (; i < chain->cl; i++) {
oc = c;
for (; i < chain->cl; i++) {
oc = c;
- c +=
str_len
(type2_list[chain->ch[i]]->shortname) + 2;
+ c +=
m_strlen
(type2_list[chain->ch[i]]->shortname) + 2;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
if (c >= COLS) {
oc = c = MIX_HOFFSET;
@@
-484,7
+485,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!");
@@
-494,7
+495,7
@@
void mix_make_chain (LIST ** chainp, int *redraw)
*redraw = REDRAW_FULL;
*redraw = REDRAW_FULL;
- chain =
mem_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);
@@
-661,8
+662,8
@@
void mix_make_chain (LIST ** chainp, int *redraw)
}
mix_free_type2_list (&type2_list);
}
mix_free_type2_list (&type2_list);
-
mem_free
(&coords);
-
mem_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 */