From 436ff11a008be140828e868ae8ffb6b5ee64f280 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 12 Jun 2022 10:55:14 -0400 Subject: [PATCH] fsck: Use `load_variant_if_exists` This cleans up error handling here. --- src/ostree/ot-builtin-fsck.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c index 0e95ae9c..60c78090 100644 --- a/src/ostree/ot-builtin-fsck.c +++ b/src/ostree/ot-builtin-fsck.c @@ -298,25 +298,15 @@ fsck_one_commit (OstreeRepo *repo, const char *checksum, GVariant *commit, GPtrA if (opt_add_tombstones) { - GError *local_error = NULL; g_autofree char *parent = ostree_commit_get_parent (commit); if (parent) { g_autoptr(GVariant) parent_commit = NULL; - if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, parent, - &parent_commit, &local_error)) - { - if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) - { - g_ptr_array_add (tombstones, g_strdup (checksum)); - g_clear_error (&local_error); - } - else - { - g_propagate_error (error, local_error); - return FALSE; - } - } + if (!ostree_repo_load_variant_if_exists (repo, OSTREE_OBJECT_TYPE_COMMIT, parent, + &parent_commit, error)) + return FALSE; + if (!parent_commit) + g_ptr_array_add (tombstones, g_strdup (checksum)); } }