diff options
author | Colin Walters <walters@verbum.org> | 2017-10-11 09:41:31 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-10-11 19:26:10 +0000 |
commit | 1825f03fe77cdc028aa19c6b2f20086381fd2604 (patch) | |
tree | da0614f2690dd083e3c38ac049342219cdfd257a /src/libostree/ostree-gpg-verifier.c | |
parent | 3e3d28632d9a3c9cd974531487bdc830c326b184 (diff) | |
download | ostree-1825f03fe77cdc028aa19c6b2f20086381fd2604.tar.gz |
tree-wide: Update to new libglnx fd APIs
This ends up a lot better IMO. This commit is *mostly* just
`s/glnx_close_fd/glnx_autofd`, but there's also a number of hunks like:
```
- if (self->sysroot_fd != -1)
- {
- (void) close (self->sysroot_fd);
- self->sysroot_fd = -1;
- }
+ glnx_close_fd (&self->sysroot_fd);
```
Update submodule: libglnx
Closes: #1259
Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-gpg-verifier.c')
-rw-r--r-- | src/libostree/ostree-gpg-verifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c index 17655c1a..4bbf7f2d 100644 --- a/src/libostree/ostree-gpg-verifier.c +++ b/src/libostree/ostree-gpg-verifier.c @@ -177,7 +177,7 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self, for (guint i = 0; i < self->key_ascii_files->len; i++) { const char *path = self->key_ascii_files->pdata[i]; - glnx_fd_close int fd = -1; + glnx_autofd int fd = -1; g_auto(gpgme_data_t) kdata = NULL; if (!glnx_openat_rdonly (AT_FDCWD, path, TRUE, &fd, error)) @@ -355,7 +355,7 @@ _ostree_gpg_verifier_add_keyring_dir_at (OstreeGpgVerifier *self, if (g_str_equal (name, "secring.gpg")) continue; - glnx_fd_close int fd = -1; + glnx_autofd int fd = -1; if (!glnx_openat_rdonly (dfd_iter.fd, dent->d_name, TRUE, &fd, error)) return FALSE; |