# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "enter.h"
#include "handler.h"
}
/* Read Entries */
cur = 0;
- Table = mem_calloc (cert_num, sizeof (smime_id));
+ Table = p_new(smime_id, cert_num);
while (!feof (index)) {
numFields =
fscanf (index, MUTT_FORMAT (STRING) " %x.%i " MUTT_FORMAT (STRING),
}
}
if (hash) {
- fname = mem_malloc (13); /* Hash + '.' + Suffix + \0 */
+ fname = p_new(char, 13); /* Hash + '.' + Suffix + \0 */
sprintf (fname, "%.8x.%i", Table[cur].hash, Table[cur].suffix);
}
else
fname = NULL;
mutt_menuDestroy (&menu);
- mem_free (&Table);
+ p_delete(&Table);
set_option (OPTNEEDREDRAW);
if (fname)
/* the key used last time. */
if (*SmimeKeyToUse &&
!str_casecmp (k, SmimeKeyToUse + str_len (SmimeKeys) + 1)) {
- mem_free (&k);
+ p_delete(&k);
return;
}
else
if (str_casecmp (k, SmimeDefaultKey))
smime_void_passphrase ();
- mem_free (&k);
+ p_delete(&k);
return;
}
}
if (!keyID) {
mutt_message (_("No (valid) certificate found for %s."), q->mailbox);
- mem_free (&keylist);
+ p_delete(&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
if (copy && buffer && num) {
(*num) = count;
- *buffer = mem_calloc (sizeof (char *), count);
+ *buffer = p_new(char *, count);
count = 0;
rewind (fpout);
while ((fgets (email, sizeof (email), fpout))) {
*(email + str_len (email) - 1) = '\0';
- (*buffer)[count] = mem_calloc (1, str_len (email) + 1);
- strncpy ((*buffer)[count], email, str_len (email));
+ (*buffer)[count] = p_dupstr(email, str_len(email));
count++;
}
}
mutt_wait_filter (thepid);
mutt_unlink (certfile);
- mem_free (&certfile);
+ p_delete(&certfile);
}
fflush (fpout);
else
retval = 0;
mutt_unlink (certfile);
- mem_free (&certfile);
+ p_delete(&certfile);
}
else
mutt_any_key_to_continue (_("no certfile"));
if (linelen && !str_casecmp (line, "verification successful"))
badsig = 0;
- mem_free (&line);
+ p_delete(&line);
}
}
line = mutt_read_line (line, &linelen, smimeerr, &lineno);
if (linelen && !str_casecmp (line, "verification successful"))
m->goodsig = 1;
- mem_free (&line);
+ p_delete(&line);
}
else {
m->goodsig = p->goodsig;
break;
case 4: /* (c)lear */
- mem_free (&SmimeCryptAlg);
+ p_delete(&SmimeCryptAlg);
/* fallback */
case -1: /* Ctrl-G or Enter */
choice = 0;