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

Merge pull request #2707 from lucab/ups/libostree-bootloader-asserts 

lib/bootloader: assert invariants
This commit is contained in:
Luca Bruno 2022-09-06 00:36:11 +00:00 committed by GitHub
parent fdbc05dab0 273089d9e4
commit 73eda79662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-bootconfig-parser.c
View File

@ -73,7 +73,7 @@ ostree_bootconfig_parser_parse_at (OstreeBootconfigParser *self,
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (!self->parsed, FALSE);
g_assert (!self->parsed);
g_autofree char *contents = glnx_file_get_contents_utf8_at (dfd, path, NULL, cancellable, error);
if (!contents)

10
src/libostree/ostree-bootloader.c
View File

@ -31,7 +31,7 @@ _ostree_bootloader_query (OstreeBootloader *self,
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (OSTREE_IS_BOOTLOADER (self), FALSE);
g_assert (OSTREE_IS_BOOTLOADER (self));
return OSTREE_BOOTLOADER_GET_IFACE (self)->query (self, out_is_active, cancellable, error);
}
@ -44,7 +44,7 @@ _ostree_bootloader_query (OstreeBootloader *self,
const char *
_ostree_bootloader_get_name (OstreeBootloader *self)
{
g_return_val_if_fail (OSTREE_IS_BOOTLOADER (self), NULL);
g_assert (OSTREE_IS_BOOTLOADER (self));
return OSTREE_BOOTLOADER_GET_IFACE (self)->get_name (self);
}
@ -56,7 +56,7 @@ _ostree_bootloader_write_config (OstreeBootloader *self,
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (OSTREE_IS_BOOTLOADER (self), FALSE);
g_assert (OSTREE_IS_BOOTLOADER (self));
return OSTREE_BOOTLOADER_GET_IFACE (self)->write_config (self, bootversion,
new_deployments,
@ -69,7 +69,7 @@ _ostree_bootloader_post_bls_sync (OstreeBootloader *self,
GCancellable *cancellable,
GError **error)
{
g_return_val_if_fail (OSTREE_IS_BOOTLOADER (self), FALSE);
g_assert (OSTREE_IS_BOOTLOADER (self));
if (OSTREE_BOOTLOADER_GET_IFACE (self)->post_bls_sync)
return OSTREE_BOOTLOADER_GET_IFACE (self)->post_bls_sync (self, bootversion, cancellable, error);
@ -80,7 +80,7 @@ _ostree_bootloader_post_bls_sync (OstreeBootloader *self,
gboolean
_ostree_bootloader_is_atomic (OstreeBootloader *self)
{
g_return_val_if_fail (OSTREE_IS_BOOTLOADER (self), FALSE);
g_assert (OSTREE_IS_BOOTLOADER (self));
if (OSTREE_BOOTLOADER_GET_IFACE (self)->is_atomic)
return OSTREE_BOOTLOADER_GET_IFACE (self)->is_atomic (self);