diff options
Diffstat (limited to 'src/vfs-mount.c')
| -rw-r--r-- | src/vfs-mount.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/vfs-mount.c b/src/vfs-mount.c index b9b1b4d2..5f0a196e 100644 --- a/src/vfs-mount.c +++ b/src/vfs-mount.c @@ -29,6 +29,7 @@ #include "context.h" #include "ops.h" #include "util.h" +#include "mem.h" typedef struct { @@ -71,8 +72,8 @@ _gpgme_vfs_mount_status_handler (void *priv, const char *code, const char *args) if (! strcasecmp ("MOUNTPOINT", code)) { if (opd->result.mount_dir) - free (opd->result.mount_dir); - opd->result.mount_dir = strdup (args); + _gpgme_free (opd->result.mount_dir); + opd->result.mount_dir = _gpgme_strdup (args); } return 0; @@ -182,17 +183,17 @@ _gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file, if (err) return err; - if (asprintf (&cmd, "OPEN -- %s", container_file_esc) < 0) + if (_gpgme_asprintf (&cmd, "OPEN -- %s", container_file_esc) < 0) { err = gpg_error_from_syserror (); - free (container_file_esc); + _gpgme_free (container_file_esc); return err; } - free (container_file_esc); + _gpgme_free (container_file_esc); err = gpgme_op_vfs_transact (ctx, cmd, NULL, NULL, NULL, NULL, NULL, NULL, op_err); - free (cmd); + _gpgme_free (cmd); if (err || *op_err) return err; @@ -204,23 +205,23 @@ _gpgme_op_vfs_mount (gpgme_ctx_t ctx, const char *container_file, if (err) return err; - if (asprintf (&cmd, "MOUNT -- %s", mount_dir_esc) < 0) + if (_gpgme_asprintf (&cmd, "MOUNT -- %s", mount_dir_esc) < 0) { err = gpg_error_from_syserror (); - free (mount_dir_esc); + _gpgme_free (mount_dir_esc); return err; } - free (mount_dir_esc); + _gpgme_free (mount_dir_esc); } else { - if (asprintf (&cmd, "MOUNT") < 0) + if (_gpgme_asprintf (&cmd, "MOUNT") < 0) return gpg_error_from_syserror (); } err = gpgme_op_vfs_transact (ctx, cmd, NULL, NULL, NULL, NULL, _gpgme_vfs_mount_status_handler, ctx, op_err); - free (cmd); + _gpgme_free (cmd); return err; } |