diff options
| author | Luca BRUNO <luca.bruno@coreos.com> | 2022-09-05 09:22:26 +0000 |
|---|---|---|
| committer | Luca BRUNO <luca.bruno@coreos.com> | 2022-09-05 09:27:38 +0000 |
| commit | 273089d9e43baab25d09732c639c22bda087bae9 (patch) | |
| tree | ddc89f06fb7d249a48e19008cb913bb5d5248a85 | |
| parent | eed9e9f335eeddb6cd648239daa23e99b93f9d41 (diff) | |
| download | ostree-273089d9e43baab25d09732c639c22bda087bae9.tar.gz | |
lib/bootloader: assert invariants
This tweaks some invariants checks into full assertions, in order
to avoid returning to the caller in case of known invalid states.
| -rw-r--r-- | src/libostree/ostree-bootconfig-parser.c | 2 | ||||
| -rw-r--r-- | src/libostree/ostree-bootloader.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libostree/ostree-bootconfig-parser.c b/src/libostree/ostree-bootconfig-parser.c index e005fab9..08259ebf 100644 --- a/src/libostree/ostree-bootconfig-parser.c +++ b/src/libostree/ostree-bootconfig-parser.c @@ -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) diff --git a/src/libostree/ostree-bootloader.c b/src/libostree/ostree-bootloader.c index 785fd233..790bf502 100644 --- a/src/libostree/ostree-bootloader.c +++ b/src/libostree/ostree-bootloader.c @@ -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); |