projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update gettext copy.
[apps/madmutt.git]
/
gnupgparse.c
diff --git
a/gnupgparse.c
b/gnupgparse.c
index
1f8a0a3
..
ce4d92e
100644
(file)
--- a/
gnupgparse.c
+++ b/
gnupgparse.c
@@
-33,6
+33,8
@@
#include <time.h>
#include <ctype.h>
#include <time.h>
#include <ctype.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
@@
-40,7
+42,6
@@
/* for hexval */
#include "mime.h"
/* for hexval */
#include "mime.h"
-#include "lib/mem.h"
#include "lib/str.h"
#include "lib/debug.h"
#include "lib/str.h"
#include "lib/debug.h"
@@
-88,7
+89,7
@@
static void fix_uid (char *uid)
char *ob;
size_t ibl, obl;
char *ob;
size_t ibl, obl;
- buf =
mem_malloc (
n + 1);
+ buf =
p_new(char,
n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
my_iconv(cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
my_iconv(cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
@@
-99,7
+100,7
@@
static void fix_uid (char *uid)
else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
memcpy (uid, buf, n);
}
else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
memcpy (uid, buf, n);
}
-
mem_free
(&buf);
+
p_delete
(&buf);
iconv_close (cd);
}
}
iconv_close (cd);
}
}
@@
-142,7
+143,7
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
- k =
mem_calloc (sizeof *k, 1
);
+ k =
pgp_new_keyinfo(
);
break;
}
break;
}
@@
-246,7
+247,7
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
debug_print (2, ("user ID: %s\n", p));
debug_print (2, ("user ID: %s\n", p));
- uid =
mem_calloc (sizeof (pgp_uid_t)
, 1);
+ uid =
p_new(pgp_uid_t
, 1);
fix_uid (p);
uid->addr = str_dup (p);
uid->trust = trust;
fix_uid (p);
uid->addr = str_dup (p);
uid->trust = trust;