shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-02-01 09:47:45 +03:00
Code Issues Projects Releases Wiki Activity

sysroot: Fix gcc -fanalyzer warning

Browse Source 
In general, we're probably going to need to change most of our
`g_return_if_fail` to `g_assert`.  The analyzer flags that
the function can return `NULL`, but the caller isn't prepared for
this.

In practice, let's abort.
This commit is contained in:
Colin Walters 2021-10-08 08:59:52 -04:00
parent 9a7f9c2095
commit 520b45afdd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1235,12 +1235,15 @@ ostree_sysroot_get_subbootversion (OstreeSysroot *self)
* ostree_sysroot_get_booted_deployment: * ostree_sysroot_get_booted_deployment:
* @self: Sysroot * @self: Sysroot
* *
* This function may only be called if the sysroot is loaded.
*
* Returns: (transfer none) (nullable): The currently booted deployment, or %NULL if none * Returns: (transfer none) (nullable): The currently booted deployment, or %NULL if none
*/ */
OstreeDeployment * OstreeDeployment *
ostree_sysroot_get_booted_deployment (OstreeSysroot *self) ostree_sysroot_get_booted_deployment (OstreeSysroot *self)
{ {
g_return_val_if_fail (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self);
g_assert (self->loadstate == OSTREE_SYSROOT_LOAD_STATE_LOADED);
return self->booted_deployment; return self->booted_deployment;
} }
@ -1390,7 +1393,8 @@ ostree_sysroot_get_repo (OstreeSysroot *self,
OstreeRepo * OstreeRepo *
ostree_sysroot_repo (OstreeSysroot *self) ostree_sysroot_repo (OstreeSysroot *self)
{ {
g_return_val_if_fail (self->loadstate >= OSTREE_SYSROOT_LOAD_STATE_LOADED, NULL); g_assert (self);
g_assert (self->loadstate >= OSTREE_SYSROOT_LOAD_STATE_LOADED);
g_assert (self->repo); g_assert (self->repo);
return self->repo; return self->repo;
} }