diff options
| author | Colin Walters <walters@verbum.org> | 2016-11-16 09:19:52 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-11-17 09:44:07 +0000 |
| commit | a6cfe62eb8780491edf884fc4ad84c8a4c0e950f (patch) | |
| tree | 3c35089d0487d1d2fece4bb643790d8289e1608d /src/libostree/ostree-gpg-verifier.c | |
| parent | bd45e7ac19a4030d6dbd276004aa1678494ec74d (diff) | |
| download | ostree-a6cfe62eb8780491edf884fc4ad84c8a4c0e950f.tar.gz | |
lib: Define and use cleanup functions for gpgme
Just a cleanup in preparation for future work.
Closes: #575
Approved by: giuseppe
Diffstat (limited to 'src/libostree/ostree-gpg-verifier.c')
| -rw-r--r-- | src/libostree/ostree-gpg-verifier.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c index d487507f..9eae7ceb 100644 --- a/src/libostree/ostree-gpg-verifier.c +++ b/src/libostree/ostree-gpg-verifier.c @@ -25,6 +25,7 @@ #include "libglnx.h" #include "ostree-gpg-verifier.h" +#include "ot-gpg-utils.h" #include "ostree-gpg-verify-result-private.h" #include "otutil.h" @@ -89,10 +90,9 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self, GCancellable *cancellable, GError **error) { - gpgme_ctx_t gpg_ctx = NULL; gpgme_error_t gpg_error = 0; - gpgme_data_t data_buffer = NULL; - gpgme_data_t signature_buffer = NULL; + ot_auto_gpgme_data gpgme_data_t data_buffer = NULL; + ot_auto_gpgme_data gpgme_data_t signature_buffer = NULL; g_autofree char *tmp_dir = NULL; g_autoptr(GOutputStream) target_stream = NULL; OstreeGpgVerifyResult *result = NULL; @@ -191,14 +191,6 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self, success = TRUE; out: - - if (gpg_ctx != NULL) - gpgme_release (gpg_ctx); - if (data_buffer != NULL) - gpgme_data_release (data_buffer); - if (signature_buffer != NULL) - gpgme_data_release (signature_buffer); - if (success) { /* Keep the temporary directory around for the life of the result |