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/progress.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/progress.c')
-rw-r--r-- | src/progress.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/progress.c b/src/progress.c index c10ccaa8..7a2545f5 100644 --- a/src/progress.c +++ b/src/progress.c @@ -29,6 +29,7 @@ #include "util.h" #include "context.h" #include "debug.h" +#include "mem.h" gpgme_error_t @@ -45,7 +46,7 @@ _gpgme_progress_status_handler (void *priv, gpgme_status_code_t code, if (code != GPGME_STATUS_PROGRESS || !*args || !ctx->progress_cb) return 0; - args_cpy = strdup (args); + args_cpy = _gpgme_strdup (args); if (!args_cpy) return gpg_error_from_syserror (); @@ -77,6 +78,6 @@ _gpgme_progress_status_handler (void *priv, gpgme_status_code_t code, if (type != 'X') ctx->progress_cb (ctx->progress_cb_value, args_cpy, type, current, total); - free (args_cpy); + _gpgme_free (args_cpy); return 0; } |