[ostree] [staticanalysis]: Add assertion to pacify analyzer
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] [staticanalysis]: Add assertion to pacify analyzer
- Date: Sun, 22 Jun 2014 00:21:39 +0000 (UTC)
commit 2dc0cea50310a6707d45351cfdf9a334c2bc85c1
Author: Colin Walters <walters verbum org>
Date: Sat Jun 21 17:28:54 2014 -0400
[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 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index b955370..3ae8ae2 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)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]