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

sysroot: Strengthen several `g_return_if_fail` into `g_assert()` 

Similar to prior changes; motivated by testing out an updated
`gcc -fanalyzer`.
This commit is contained in:
Colin Walters 2022-05-16 10:59:27 -04:00
parent e27fed45fd
commit 6a055f802f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libostree/ostree-sysroot.c
View File

@ -1267,7 +1267,7 @@ ostree_sysroot_get_booted_deployment (OstreeSysroot *self)
OstreeDeployment * OstreeDeployment *
ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error) ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
if (!self->booted_deployment) if (!self->booted_deployment)
return glnx_null_throw (error, "Not currently booted into an OSTree system"); return glnx_null_throw (error, "Not currently booted into an OSTree system");
@ -1286,7 +1286,7 @@ ostree_sysroot_require_booted_deployment (OstreeSysroot *self, GError **error)
OstreeDeployment * OstreeDeployment *
ostree_sysroot_get_staged_deployment (OstreeSysroot *self) ostree_sysroot_get_staged_deployment (OstreeSysroot *self)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
return self->staged_deployment; return self->staged_deployment;
} }
@ -1300,7 +1300,7 @@ ostree_sysroot_get_staged_deployment (OstreeSysroot *self)
GPtrArray * GPtrArray *
ostree_sysroot_get_deployments (OstreeSysroot *self) ostree_sysroot_get_deployments (OstreeSysroot *self)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
GPtrArray *copy = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref); GPtrArray *copy = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
for (guint i = 0; i < self->deployments->len; i++) for (guint i = 0; i < self->deployments->len; i++)
@ -1525,7 +1525,7 @@ ostree_sysroot_query_deployments_for (OstreeSysroot *self,
OstreeDeployment **out_pending, OstreeDeployment **out_pending,
OstreeDeployment **out_rollback) OstreeDeployment **out_rollback)
{ {
g_return_if_fail (osname != NULL || self->booted_deployment != NULL); g_assert (osname != NULL || self->booted_deployment != NULL);
g_autoptr(OstreeDeployment) ret_pending = NULL; g_autoptr(OstreeDeployment) ret_pending = NULL;
g_autoptr(OstreeDeployment) ret_rollback = NULL; g_autoptr(OstreeDeployment) ret_rollback = NULL;