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/libotutil | |
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/libotutil')
-rw-r--r-- | src/libotutil/ot-fs-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libotutil/ot-fs-utils.c b/src/libotutil/ot-fs-utils.c index cad27496..0dea3a9c 100644 --- a/src/libotutil/ot-fs-utils.c +++ b/src/libotutil/ot-fs-utils.c @@ -79,7 +79,7 @@ ot_openat_read_stream (int dfd, GCancellable *cancellable, GError **error) { - glnx_fd_close int fd = -1; + glnx_autofd int fd = -1; if (!glnx_openat_rdonly (dfd, path, follow, &fd, error)) return FALSE; *out_istream = g_unix_input_stream_new (glnx_steal_fd (&fd), TRUE); @@ -127,7 +127,7 @@ ot_dfd_iter_init_allow_noent (int dfd, gboolean *out_exists, GError **error) { - glnx_fd_close int fd = glnx_opendirat_with_errno (dfd, path, TRUE); + glnx_autofd int fd = glnx_opendirat_with_errno (dfd, path, TRUE); if (fd < 0) { if (errno != ENOENT) |