From f1e24945fa03c12417ba0e47fedc8e87c9c0a1f1 Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Tue, 7 Dec 2021 16:13:54 +0000 Subject: lib/repo: assert that writable state and error agree This adds an assertion to check that writable stable and error are in sync. The subsequent logic uses them interchangeably. --- src/libostree/ostree-repo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index a9be9f94..85700b03 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -1560,8 +1560,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); -- cgit v1.2.1 From 4a0ebe507fae41e7f080e15c492f629fdeeaf4ca Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Tue, 7 Dec 2021 16:16:39 +0000 Subject: lib/repo: do no return an arbitrary mode on failure This turns the existing check into an assert. Otherwise, the previous code may return an arbitrary repo mode (bare) on failure. --- src/libostree/ostree-repo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 85700b03..f07d2235 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -3816,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; } -- cgit v1.2.1 From 58bdfb90c98cd4189fd78e5499f77fc3d5ee3adc Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Tue, 7 Dec 2021 16:20:49 +0000 Subject: 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. --- src/libostree/ostree-repo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); -- cgit v1.2.1