X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt.c;h=e5019eca6517b99cab4199d7280d1c0ef45b784d;hp=402a497dea615ed70386aaf3327775ef543c3450;hb=9e6ab0152703ad301042ce8810859f41fbee405a;hpb=f5b0e714a215eddd4d9f8084b434b713f0a580b4 diff --git a/crypt.c b/crypt.c index 402a497..e5019ec 100644 --- a/crypt.c +++ b/crypt.c @@ -16,6 +16,8 @@ # include "config.h" #endif +#include + #include "mutt.h" #include "ascii.h" #include "handler.h" @@ -25,7 +27,6 @@ #include "mutt_crypt.h" #include "pgp.h" -#include "lib/mem.h" #include "lib/intl.h" #include "lib/str.h" @@ -51,7 +52,7 @@ /* 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, const char *app_name) { time_t t; char p[STRING], tmp[STRING]; @@ -487,7 +488,7 @@ int crypt_write_signed (BODY * a, STATE * s, const char *tempfile) return -1; } - fseek (s->fpin, a->hdr_offset, 0); + fseeko (s->fpin, a->hdr_offset, 0); bytes = a->length + a->offset - a->hdr_offset; hadcr = 0; while (bytes > 0) { @@ -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; @@ -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) - mem_realloc (signatures, (*n + 6) * sizeof (BODY **)); + p_realloc(signatures, *n + 6); (*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); - mem_free (&signatures); + p_delete(&signatures); } else state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),