diff options
| author | Werner Koch <wk@gnupg.org> | 2013-12-12 15:13:09 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-12-12 15:28:06 +0100 |
| commit | 3b30e9840d4b351c4de73b126e561154cb7df4cc (patch) | |
| tree | ef3d2d1127165ef5866840d33ccde9d35a2dee33 /cipher/pubkey.c | |
| parent | cd548ba2dc777b8b27d8d33182ba733c20222120 (diff) | |
| download | libgcrypt-3b30e9840d4b351c4de73b126e561154cb7df4cc.tar.gz | |
Remove macro hacks for internal vs. external functions. Part 2 and last.
* src/visibility.h: Remove remaining define/undef hacks for symbol
visibility. Add macros to detect the use of the public functions.
Change all affected functions by replacing them by the x-macros.
* src/g10lib.h: Add internal prototypes.
(xtrymalloc, xtrycalloc, xtrymalloc_secure, xtrycalloc_secure)
(xtryrealloc, xtrystrdup, xmalloc, xcalloc, xmalloc_secure)
(xcalloc_secure, xrealloc, xstrdup, xfree): New macros.
--
The use of xmalloc/xtrymalloc/xfree is a more common pattern than the
gcry_free etc. functions. Those functions behave like those defined
by C and thus for better readability we use these macros and not
the underscore prefixed functions.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/pubkey.c')
| -rw-r--r-- | cipher/pubkey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cipher/pubkey.c b/cipher/pubkey.c index e89fa950..d1303881 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -153,7 +153,7 @@ spec_from_sexp (gcry_sexp_t sexp, int want_private, return GPG_ERR_INV_OBJ; /* Invalid structure of object. */ } spec = spec_from_name (name); - gcry_free (name); + xfree (name); if (!spec) { sexp_release (list); @@ -569,7 +569,7 @@ _gcry_pk_genkey (gcry_sexp_t *r_key, gcry_sexp_t s_parms) } spec = spec_from_name (name); - gcry_free (name); + xfree (name); name = NULL; if (!spec) { @@ -584,7 +584,7 @@ _gcry_pk_genkey (gcry_sexp_t *r_key, gcry_sexp_t s_parms) leave: sexp_release (list); - gcry_free (name); + xfree (name); sexp_release (l2); return rc; @@ -702,7 +702,7 @@ _gcry_pk_get_keygrip (gcry_sexp_t key, unsigned char *array) if (!array) { - array = gcry_malloc (20); + array = xtrymalloc (20); if (! array) goto fail; } @@ -711,7 +711,7 @@ _gcry_pk_get_keygrip (gcry_sexp_t key, unsigned char *array) okay = 1; fail: - gcry_free (name); + xfree (name); sexp_release (l2); _gcry_md_close (md); sexp_release (list); |