projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fix
[apps/madmutt.git]
/
crypt.c
diff --git
a/crypt.c
b/crypt.c
index
eac7a85
..
1512286
100644
(file)
--- a/
crypt.c
+++ b/
crypt.c
@@
-16,6
+16,9
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "ascii.h"
#include "handler.h"
#include "mutt.h"
#include "ascii.h"
#include "handler.h"
@@
-25,8
+28,6
@@
#include "mutt_crypt.h"
#include "pgp.h"
#include "mutt_crypt.h"
#include "pgp.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <sys/wait.h>
#include "lib/str.h"
#include <sys/wait.h>
@@
-51,7
+52,7
@@
/* print the current time to avoid spoofing of the signature output */
/* print the current time to avoid spoofing of the signature output */
-void crypt_current_time (STATE * s, char *app_name)
+void crypt_current_time (STATE * s, c
onst c
har *app_name)
{
time_t t;
char p[STRING], tmp[STRING];
{
time_t t;
char p[STRING], tmp[STRING];
@@
-697,7
+698,7
@@
int crypt_get_keys (HEADER * msg, char **keylist)
-static void crypt_fetch_signatures (BODY ***
signatures, BODY * a, int *n)
+static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
{
if (!WithCrypto)
return;
{
if (!WithCrypto)
return;
@@
-707,7
+708,7
@@
static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
crypt_fetch_signatures (signatures, a->parts, n);
else {
if ((*n % 5) == 0)
crypt_fetch_signatures (signatures, a->parts, n);
else {
if ((*n % 5) == 0)
-
mem_realloc (signatures, (*n + 6) * sizeof (BODY **)
);
+
p_realloc(signatures, *n + 6
);
(*signatures)[(*n)++] = a;
}
(*signatures)[(*n)++] = a;
}
@@
-826,7
+827,7
@@
int mutt_signed_handler (BODY * a, STATE * s)
state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
-
mem_free
(&signatures);
+
p_delete
(&signatures);
}
else
state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),
}
else
state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),