projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move intl.h into lib-lib/macros.h
[apps/madmutt.git]
/
smime.c
diff --git
a/smime.c
b/smime.c
index
95083df
..
88989f5
100644
(file)
--- a/
smime.c
+++ b/
smime.c
@@
-14,6
+14,7
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-24,8
+25,6
@@
#include "mime.h"
#include "copy.h"
#include "mime.h"
#include "copy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#include "lib/str.h"
#include "lib/debug.h"
@@
-391,7
+390,7
@@
char *smime_ask_for_key (char *prompt, char *mailbox, short public)
}
/* Read Entries */
cur = 0;
}
/* 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),
while (!feof (index)) {
numFields =
fscanf (index, MUTT_FORMAT (STRING) " %x.%i " MUTT_FORMAT (STRING),
@@
-775,7
+774,7
@@
char *smime_findKeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc)
}
keylist_size += str_len (keyID) + 2;
}
keylist_size += str_len (keyID) + 2;
-
mem_realloc
(&keylist, keylist_size);
+
p_realloc
(&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
keylist_used = str_len (keylist);
sprintf (keylist + keylist_used, "%s\n", keyID); /* __SPRINTF_CHECKED__ */
keylist_used = str_len (keylist);
@@
-856,14
+855,13
@@
static int smime_handle_cert_email (char *certificate, char *mailbox,
if (copy && buffer && num) {
(*num) = count;
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';
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++;
}
}
count++;
}
}