diff options
author | Ben Kibbey <[email protected]> | 2014-10-10 13:02:09 +0000 |
---|---|---|
committer | Ben Kibbey <[email protected]> | 2014-10-16 01:34:10 +0000 |
commit | aea2c168fc9c12148181dbcc33d7085aad8e6d90 (patch) | |
tree | 0da3de376e89130822b76edef6d935b294a83d87 /src/engine-g13.c | |
parent | build: Implement SYSROOT feature. (diff) | |
download | gpgme-aea2c168fc9c12148181dbcc33d7085aad8e6d90.tar.gz gpgme-aea2c168fc9c12148181dbcc33d7085aad8e6d90.zip |
Add gpgme_set_global_malloc_hooks().
* configure.ac: Remove check for vasprintf().
* doc/gpgme.texi: Add documentation.
* src/gpgme.h.in (gpgme_malloc_hooks,gpgme_malloc_hooks_t): New.
* src/gpgme.h.in (gpgme_set_global_malloc_hooks): New prototype.
* src/mem.c, src/mem.h: New.
* src/gpgme.c (gpgme_set_global_malloc_hooks): New.
* src/gpgme.def, src/libgpgme.vers: Add gpgme_set_global_malloc_hooks.
* src/vasprintf.c (vasprintf): Rename to _gpgme_vasprintf().
* src/vasprintf.c (asprintf): Rename to _gpgme_asprintf().
* src/Makefile.am: Add mem.c, mem.h and vasprintf.c to main_sources.
* src/assuan-support.c, src/ath-pthread.c, src/conversion.c,
src/data-compat.c, src/data-identify.c, src/data-mem.c, src/data.c,
src/debug.c, src/decrypt.c, src/dirinfo.c, src/encrypt.c,
src/engine-assuan.c, src/engine-g13.c, src/engine-gpg.c,
src/engine-gpgconf.c, src/engine-gpgsm.c, src/engine-spawn.c,
src/engine-uiserver.c, src/engine.c, src/export.c, src/genkey.c,
src/get-env.c, src/gpgme-w32spawn.c, src/gpgme.c, src/import.c,
src/key.c, src/keylist.c, src/op-support.c, src/passphrase.c,
src/posix-io.c, src/posix-util.c, src/progress.c, src/setenv.c,
src/sig-notation.c, src/sign.c, src/signers.c, src/trust-item.c,
src/trustlist.c, src/util.h, src/verify.c, src/version.c,
src/vfs-create.c, src/vfs-mount.c, src/w32-ce.c, src/w32-ce.h,
src/w32-glib-io.c, src/w32-io.c, src/w32-sema.c, src/w32-util.c,
src/wait-global.c, src/wait.c:
Change allocation functions: free() to _gpgme_free(), malloc() to
_gpgme_malloc(), calloc() to _gpgme_calloc(), realloc() to
_gpgme_realloc() and strdup() to _gpgme_strdup().
--
Mostly borrowed from libassuan for custom memory handling. This changes
vasprintf.c to implement _gpgme_asprintf() and _gpgme_vasprintf() and
will always use the built-in vasprintf() even when provided by the OS.
Diffstat (limited to 'src/engine-g13.c')
-rw-r--r-- | src/engine-g13.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/engine-g13.c b/src/engine-g13.c index a9717eec..76f0cd3f 100644 --- a/src/engine-g13.c +++ b/src/engine-g13.c @@ -50,6 +50,8 @@ #include "engine-backend.h" +#include "mem.h" + typedef struct { @@ -207,7 +209,7 @@ g13_release (void *engine) g13_cancel (engine); - free (g13); + _gpgme_free (g13); } @@ -224,7 +226,7 @@ g13_new (void **engine, const char *file_name, const char *home_dir) char *dft_ttytype = NULL; char *optstr; - g13 = calloc (1, sizeof *g13); + g13 = _gpgme_calloc (1, sizeof *g13); if (!g13) return gpg_error_from_syserror (); @@ -266,17 +268,17 @@ g13_new (void **engine, const char *file_name, const char *home_dir) goto leave; if (dft_display) { - if (asprintf (&optstr, "OPTION display=%s", dft_display) < 0) + if (_gpgme_asprintf (&optstr, "OPTION display=%s", dft_display) < 0) { - free (dft_display); + _gpgme_free (dft_display); err = gpg_error_from_syserror (); goto leave; } - free (dft_display); + _gpgme_free (dft_display); err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); if (err) goto leave; } @@ -293,14 +295,14 @@ g13_new (void **engine, const char *file_name, const char *home_dir) } else { - if (asprintf (&optstr, "OPTION ttyname=%s", dft_ttyname) < 0) + if (_gpgme_asprintf (&optstr, "OPTION ttyname=%s", dft_ttyname) < 0) { err = gpg_error_from_syserror (); goto leave; } err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); if (err) goto leave; @@ -309,17 +311,17 @@ g13_new (void **engine, const char *file_name, const char *home_dir) goto leave; if (dft_ttytype) { - if (asprintf (&optstr, "OPTION ttytype=%s", dft_ttytype) < 0) + if (_gpgme_asprintf (&optstr, "OPTION ttytype=%s", dft_ttytype) < 0) { - free (dft_ttytype); + _gpgme_free (dft_ttytype); err = gpg_error_from_syserror (); goto leave; } - free (dft_ttytype); + _gpgme_free (dft_ttytype); err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); if (err) goto leave; } @@ -389,13 +391,13 @@ g13_set_locale (void *engine, int category, const char *value) if (!value) return 0; - if (asprintf (&optstr, "OPTION %s=%s", catstr, value) < 0) + if (_gpgme_asprintf (&optstr, "OPTION %s=%s", catstr, value) < 0) err = gpg_error_from_syserror (); else { err = assuan_transact (g13->assuan_ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - free (optstr); + _gpgme_free (optstr); } return err; |