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-checkout.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-checkout.c')
| -rw-r--r-- | src/libostree/ostree-repo-checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index a3dd6887..99896142 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -782,7 +782,7 @@ checkout_tree_at_recurse (OstreeRepo *self, } } - glnx_fd_close int destination_dfd = -1; + glnx_autofd int destination_dfd = -1; if (!glnx_opendirat (destination_parent_fd, destination_name, TRUE, &destination_dfd, error)) return FALSE; @@ -947,7 +947,7 @@ checkout_tree_at (OstreeRepo *self, * exists. */ int destination_dfd = destination_parent_fd; - glnx_fd_close int destination_dfd_owned = -1; + glnx_autofd int destination_dfd_owned = -1; if (strcmp (destination_name, ".") != 0) { if (mkdirat (destination_parent_fd, destination_name, 0700) < 0 |