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-repo-finder-mount.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-repo-finder-mount.c')
| -rw-r--r-- | src/libostree/ostree-repo-finder-mount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libostree/ostree-repo-finder-mount.c b/src/libostree/ostree-repo-finder-mount.c index c385e70c..b41c2c8c 100644 --- a/src/libostree/ostree-repo-finder-mount.c +++ b/src/libostree/ostree-repo-finder-mount.c @@ -328,9 +328,9 @@ ostree_repo_finder_mount_resolve_async (OstreeRepoFinder *finde g_autofree gchar *mount_name = NULL; g_autoptr(GFile) mount_root = NULL; g_autofree gchar *mount_root_path = NULL; - glnx_fd_close int mount_root_dfd = -1; + glnx_autofd int mount_root_dfd = -1; struct stat mount_root_stbuf; - glnx_fd_close int repos_dfd = -1; + glnx_autofd int repos_dfd = -1; gsize i; g_autoptr(GHashTable) repo_to_refs = NULL; /* (element-type UriAndKeyring GHashTable) */ GHashTable *supported_ref_to_checksum; /* (element-type OstreeCollectionRef utf8) */ |