From: Colin Walters <walters@verbum.org>
Date: Fri, 8 Oct 2021 12:59:52 +0000 (-0400)
Subject: deployment: Fix gcc `-fanalyzer` warning
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2^2~16^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a7f9c2095a1fe834793978250be402bfb8237f6;p=ostree.git

deployment: Fix gcc `-fanalyzer` warning

In general, we're probably going to need to change most of our
`g_return_if_fail` to `g_assert`.  The analyzer flags that
the function can return `NULL`, but the caller isn't prepared for
this.

In practice, let's abort.
---

diff --git a/src/libostree/ostree-deployment.c b/src/libostree/ostree-deployment.c
index 558434de..6397d786 100644
--- a/src/libostree/ostree-deployment.c
+++ b/src/libostree/ostree-deployment.c
@@ -374,9 +374,9 @@ ostree_deployment_new (int    index,
   OstreeDeployment *self;
 
   /* index may be -1 */
-  g_return_val_if_fail (osname != NULL, NULL);
-  g_return_val_if_fail (csum != NULL, NULL);
-  g_return_val_if_fail (deployserial >= 0, NULL);
+  g_assert (osname != NULL);
+  g_assert (csum != NULL);
+  g_assert (deployserial >= 0);
   /* We can have "disconnected" deployments that don't have a
      bootcsum/serial */