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
This commit is contained in:
1 parent
57509e4d50
commit
303320163f
6 files changed
+16
-36
No files matched your search
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user