From 6063bdb0130cd0dc099bbf509f90863af7b3f0c0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 2 Aug 2017 15:44:34 -0400 Subject: [PATCH] Update libglnx This is mostly the `copy_file_range` changes plus the Coverity files. ``` Colin Walters (4): localalloc: Abort on EBADF from close() by default local-alloc: Remove almost all macros like glnx_free, glnx_unref_variant console: Fix Coverity NULL deref warning fdio: Merge systemd code to use copy_file_range(), use FICLONE Jonathan Lebon (1): console: trim useless check Matthew Leeds (1): dirfd: Fix typo in comment Philip Withnall (1): glnx-console: Add missing NULL check before writing out text ``` Update submodule: libglnx Closes: #1081 Approved by: jlebon --- libglnx | 2 +- src/libostree/ostree-repo-checkout.c | 2 +- src/libostree/ostree-repo-commit.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libglnx b/libglnx index ea6df95f..e226ccf6 160000 --- a/libglnx +++ b/libglnx @@ -1 +1 @@ -Subproject commit ea6df95f22c8f2973714bdbb8b1accc4e37d4d56 +Subproject commit e226ccf6913d1d852fde1e150a99fab508f85c34 diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index bfc280b6..3deaa297 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -122,7 +122,7 @@ write_regular_file_content (OstreeRepo *self, int infd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*) input); guint64 len = g_file_info_get_size (file_info); - if (glnx_regfile_copy_bytes (infd, outfd, (off_t)len, TRUE) < 0) + if (glnx_regfile_copy_bytes (infd, outfd, (off_t)len) < 0) return glnx_throw_errno_prefix (error, "regfile copy"); } else diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 72961dde..1c6e5e8d 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -467,7 +467,7 @@ create_regular_tmpfile_linkable_with_content (OstreeRepo *self, if (G_IS_FILE_DESCRIPTOR_BASED (input)) { int infd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*) input); - if (glnx_regfile_copy_bytes (infd, tmpf.fd, (off_t)length, TRUE) < 0) + if (glnx_regfile_copy_bytes (infd, tmpf.fd, (off_t)length) < 0) return glnx_throw_errno_prefix (error, "regfile copy"); } else