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/setenv.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/setenv.c')
| -rw-r--r-- | src/setenv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/setenv.c b/src/setenv.c index d85bec9c..99d762cf 100644 --- a/src/setenv.c +++ b/src/setenv.c @@ -142,7 +142,7 @@ __add_to_environ (const char *name, const char *value, const char *combined, char **new_environ; /* We allocated this space; we can extend it. */ - new_environ = (char **) realloc (last_environ, + new_environ = (char **) _gpgme_realloc (last_environ, (size + 2) * sizeof (char *)); if (new_environ == NULL) { @@ -177,7 +177,7 @@ __add_to_environ (const char *name, const char *value, const char *combined, if (__builtin_expect (new_environ[size] == NULL, 1)) #endif { - new_environ[size] = (char *) malloc (namelen + 1 + vallen); + new_environ[size] = (char *) _gpgme_malloc (namelen + 1 + vallen); if (__builtin_expect (new_environ[size] == NULL, 0)) { __set_errno (ENOMEM); @@ -235,7 +235,7 @@ __add_to_environ (const char *name, const char *value, const char *combined, if (__builtin_expect (np == NULL, 1)) #endif { - np = malloc (namelen + 1 + vallen); + np = _gpgme_malloc (namelen + 1 + vallen); if (__builtin_expect (np == NULL, 0)) { UNLOCK; @@ -321,7 +321,7 @@ clearenv (void) if (__environ == last_environ && __environ != NULL) { /* We allocated this environment so we can free it. */ - free (__environ); + _gpgme_free (__environ); last_environ = NULL; } |