From 2dc0cea50310a6707d45351cfdf9a334c2bc85c1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 21 Jun 2014 17:28:54 -0400 Subject: [PATCH] [staticanalysis]: Add assertion to pacify analyzer This condition can't actually be hit, let's hint that's the case. https://bugzilla.gnome.org/show_bug.cgi?id=732020 --- src/libostree/ostree-repo-commit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index b9553707..3ae8ae24 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -368,11 +368,11 @@ write_object (OstreeRepo *self, gsize unpacked_size = 0; gboolean indexable = FALSE; + g_return_val_if_fail (expected_checksum || out_csum, FALSE); + if (g_cancellable_set_error_if_cancelled (cancellable, error)) return FALSE; - g_assert (expected_checksum || out_csum); - if (expected_checksum) { if (!_ostree_repo_has_loose_object (self, expected_checksum, objtype, @@ -522,6 +522,8 @@ write_object (OstreeRepo *self, goto out; } } + + g_assert (actual_checksum != NULL); /* Pacify static analysis */ if (indexable) {