summaryrefslogtreecommitdiff
path: root/src/libostree/ostree-repo-prune.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-09-06 11:37:02 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2017-09-07 16:45:48 +0000
commit303320163f2365db9fea67f64dcc1578e034116e (patch)
treeae002f2d58cfcb41dca2ab6738ea158f0759bb2c /src/libostree/ostree-repo-prune.c
parent57509e4d50f916e1dcb5a6afdbcfe921093f965b (diff)
downloadostree-303320163f2365db9fea67f64dcc1578e034116e.tar.gz
tree-wide: Use helpers for unlinkat()
We have `ot_ensure_unlinked_at()` for the "ignore ENOENT" case, and `glnx_unlinkat()` otherwise. Port all in-tree callers to one or the other as appropriate. Just noticed an unprefixed error in the refs case and decided to do a tree-wide check. Closes: #1142 Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-repo-prune.c')
-rw-r--r--src/libostree/ostree-repo-prune.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/libostree/ostree-repo-prune.c b/src/libostree/ostree-repo-prune.c
index 2b596ecb..6ea899bc 100644
--- a/src/libostree/ostree-repo-prune.c
+++ b/src/libostree/ostree-repo-prune.c
@@ -43,13 +43,7 @@ prune_commitpartial_file (OstreeRepo *repo,
GError **error)
{
g_autofree char *path = _ostree_get_commitpartial_path (checksum);
- if (unlinkat (repo->repo_dir_fd, path, 0) != 0)
- {
- if (errno != ENOENT)
- return glnx_throw_errno_prefix (error, "unlinkat");
- }
-
- return TRUE;
+ return ot_ensure_unlinked_at (repo->repo_dir_fd, path, error);
}
static gboolean
@@ -147,8 +141,8 @@ _ostree_repo_prune_tmp (OstreeRepo *self,
if (has_sig_suffix)
dent->d_name[len - 4] = '.';
- if (unlinkat (dfd_iter.fd, dent->d_name, 0) < 0)
- return glnx_throw_errno_prefix (error, "unlinkat");
+ if (!glnx_unlinkat (dfd_iter.fd, dent->d_name, 0, error))
+ return FALSE;
}
}