diff options
| author | Colin Walters <walters@verbum.org> | 2017-07-31 13:24:25 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-02 16:55:38 +0000 |
| commit | ded6417aee906fad25a80fe5db85ee43b0552426 (patch) | |
| tree | 28cd9dd06423e35f9a917376a1e62834d251ddda /src/libostree/ostree-gpg-verifier.c | |
| parent | 6347c0fb8878ac2cf809caa74cdf7fef5a97b786 (diff) | |
| download | ostree-ded6417aee906fad25a80fe5db85ee43b0552426.tar.gz | |
lib/gpg: Switch to GLib autocleanups for gpgme types
Prep for dropping `GLNX_DEFINE_CLEANUP_FUNCTION` from libglnx
in favor of using GLib's `G_DEFINE_AUTO_CLEANUP_FREE_FUNC()`.
Closes: #1042
Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-gpg-verifier.c')
| -rw-r--r-- | src/libostree/ostree-gpg-verifier.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c index 77594d9b..680c410b 100644 --- a/src/libostree/ostree-gpg-verifier.c +++ b/src/libostree/ostree-gpg-verifier.c @@ -95,8 +95,8 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self, { GLNX_AUTO_PREFIX_ERROR("GPG", error); gpgme_error_t gpg_error = 0; - ot_auto_gpgme_data gpgme_data_t data_buffer = NULL; - ot_auto_gpgme_data gpgme_data_t signature_buffer = NULL; + g_auto(gpgme_data_t) data_buffer = NULL; + g_auto(gpgme_data_t) signature_buffer = NULL; g_autofree char *tmp_dir = NULL; g_autoptr(GOutputStream) target_stream = NULL; OstreeGpgVerifyResult *result = NULL; @@ -165,7 +165,7 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self, { const char *path = self->key_ascii_files->pdata[i]; glnx_fd_close int fd = -1; - ot_auto_gpgme_data gpgme_data_t kdata = NULL; + g_auto(gpgme_data_t) kdata = NULL; if (!glnx_openat_rdonly (AT_FDCWD, path, TRUE, &fd, error)) goto out; |