From cbec85f2d01a45922fe8812fceb3d20b2a8f6e20 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 17 Mar 2023 08:19:22 -0400 Subject: [PATCH] lib: Fix two nullable annotations - commit parents are optional - remote URLs are optional --- src/libostree/ostree-core.c | 2 +- src/libostree/ostree-remote.c | 2 +- src/libostree/ostree-sepolicy.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c index 0d1b0d5d..97888be6 100644 --- a/src/libostree/ostree-core.c +++ b/src/libostree/ostree-core.c @@ -2445,7 +2445,7 @@ ostree_validate_structureof_dirmeta (GVariant *dirmeta, * ostree_commit_get_parent: * @commit_variant: Variant of type %OSTREE_OBJECT_TYPE_COMMIT * - * Returns: Checksum of the parent commit of @commit_variant, or %NULL + * Returns: (nullable): Checksum of the parent commit of @commit_variant, or %NULL * if none */ gchar * diff --git a/src/libostree/ostree-remote.c b/src/libostree/ostree-remote.c index 04f08352..3695e0f4 100644 --- a/src/libostree/ostree-remote.c +++ b/src/libostree/ostree-remote.c @@ -186,7 +186,7 @@ ostree_remote_get_name (OstreeRemote *remote) * * Get the URL from the remote. * - * Returns: (transfer full): the remote's URL + * Returns: (transfer full) (nullable): the remote's URL * Since: 2018.6 */ gchar * diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c index 7271bec4..a7795a96 100644 --- a/src/libostree/ostree-sepolicy.c +++ b/src/libostree/ostree-sepolicy.c @@ -502,7 +502,7 @@ ostree_sepolicy_new_at (int rootfs_dfd, * policy objects to be created from file-descriptor relative paths, which * may not be globally accessible. * - * Returns: (transfer none): Path to rootfs + * Returns: (transfer none) (nullable): Path to rootfs */ GFile * ostree_sepolicy_get_path (OstreeSePolicy *self) @@ -530,7 +530,7 @@ ostree_sepolicy_get_name (OstreeSePolicy *self) * ostree_sepolicy_get_csum: * @self: * - * Returns: (transfer none): Checksum of current policy + * Returns: (transfer none) (nullable): Checksum of current policy * * Since: 2016.5 */ -- 2.30.2