From: Luca BRUNO <luca.bruno@coreos.com>
Date: Tue, 7 Dec 2021 16:20:49 +0000 (+0000)
Subject: lib/repo: do no return a NULL on failure
X-Git-Tag: archive/raspbian/2022.1-3+rpi1^2~12^2^2~10^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58bdfb90c98cd4189fd78e5499f77fc3d5ee3adc;p=ostree.git

lib/repo: do no return a NULL on failure

This turns an existing check into an assert. The previously returned
NULL may result in confusing callers, as none of them is checking for
that.
---

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index f07d2235..16636d70 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1599,7 +1599,8 @@ _ostree_repo_update_mtime (OstreeRepo        *self,
 GKeyFile *
 ostree_repo_get_config (OstreeRepo *self)
 {
-  g_return_val_if_fail (self->inited, NULL);
+  g_assert (self != NULL);
+  g_assert (self->inited);
 
   return self->config;
 }
@@ -1617,7 +1618,8 @@ ostree_repo_copy_config (OstreeRepo *self)
   char *data;
   gsize len;
 
-  g_return_val_if_fail (self->inited, NULL);
+  g_assert (self != NULL);
+  g_assert (self->inited);
 
   copy = g_key_file_new ();
   data = g_key_file_to_data (self->config, &len, NULL);