packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2496 from lucab/ups/repo-asserts 

lib/repo: fix problematic invariant checks
This commit is contained in:
Colin Walters 2021-12-07 19:58:23 -05:00 committed by GitHub
parent 490f515e18 58bdfb90c9
commit b56786c415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libostree/ostree-repo.c
View File

@ -1558,8 +1558,10 @@ gboolean
ostree_repo_is_writable (OstreeRepo *self, ostree_repo_is_writable (OstreeRepo *self,
GError **error) 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) if (error != NULL && self->writable_error != NULL)
*error = g_error_copy (self->writable_error); *error = g_error_copy (self->writable_error);
@ -1595,7 +1597,8 @@ _ostree_repo_update_mtime (OstreeRepo *self,
GKeyFile * GKeyFile *
ostree_repo_get_config (OstreeRepo *self) 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; return self->config;
} }
@ -1613,7 +1616,8 @@ ostree_repo_copy_config (OstreeRepo *self)
char *data; char *data;
gsize len; gsize len;
g_return_val_if_fail (self->inited, NULL); g_assert (self != NULL);
g_assert (self->inited);
copy = g_key_file_new (); copy = g_key_file_new ();
data = g_key_file_to_data (self->config, &len, NULL); data = g_key_file_to_data (self->config, &len, NULL);
@ -3812,7 +3816,8 @@ ostree_repo_equal (OstreeRepo *a,
OstreeRepoMode OstreeRepoMode
ostree_repo_get_mode (OstreeRepo *self) 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; return self->mode;
} }