diff options
author | Colin Walters <walters@verbum.org> | 2021-12-07 19:58:23 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-07 19:58:23 -0500 |
commit | b56786c41590d2c3f4bc285b1f0ea3cbe3f882c3 (patch) | |
tree | 01c98ce62da2f07de49229dfa6f1d739a6258e35 | |
parent | 490f515e189d1da4a0e04cc12b7a5e58e5a924dd (diff) | |
parent | 58bdfb90c98cd4189fd78e5499f77fc3d5ee3adc (diff) | |
download | ostree-b56786c41590d2c3f4bc285b1f0ea3cbe3f882c3.tar.gz |
Merge pull request #2496 from lucab/ups/repo-asserts
lib/repo: fix problematic invariant checks
-rw-r--r-- | src/libostree/ostree-repo.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 5763a262..86948ee2 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -1558,8 +1558,10 @@ gboolean ostree_repo_is_writable (OstreeRepo *self, GError **error) { - g_return_val_if_fail (self->inited, FALSE); + g_assert (self != NULL); + g_assert (self->inited); + g_assert (self->writable == (self->writable_error == NULL)); if (error != NULL && self->writable_error != NULL) *error = g_error_copy (self->writable_error); @@ -1595,7 +1597,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; } @@ -1613,7 +1616,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); @@ -3812,7 +3816,8 @@ ostree_repo_equal (OstreeRepo *a, OstreeRepoMode ostree_repo_get_mode (OstreeRepo *self) { - g_return_val_if_fail (self->inited, FALSE); + g_assert (self != NULL); + g_assert (self->inited); return self->mode; } |