From: James Westman <james@jwestman.net>
Date: Mon, 30 May 2022 22:28:54 +0000 (-0500)
Subject: Fix annotations on ostree_mutable_tree_lookup()
X-Git-Tag: archive/raspbian/2022.4-1+rpi1^2~9^2^2~4^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=03d592b1169615b6cabb2b35c218cde76a1023b6;p=ostree.git

Fix annotations on ostree_mutable_tree_lookup()

(nullable) and (optional) were missing on lookup()'s out parameters,
which caused the rust bindings for the function to not work. Due to the
missing (nullable), it would return a Result<(GString, MutableTree), _>,
not a Result<(Option<GString>, Option<MutableTree>), _>, which led to
panics.
---

diff --git a/src/libostree/ostree-mutable-tree.c b/src/libostree/ostree-mutable-tree.c
index 4b3460e3..58dd3c4c 100644
--- a/src/libostree/ostree-mutable-tree.c
+++ b/src/libostree/ostree-mutable-tree.c
@@ -403,8 +403,8 @@ ostree_mutable_tree_ensure_dir (OstreeMutableTree *self,
  * ostree_mutable_tree_lookup:
  * @self: Tree
  * @name: name
- * @out_file_checksum: (out) (transfer full): checksum
- * @out_subdir: (out) (transfer full): subdirectory
+ * @out_file_checksum: (out) (transfer full) (nullable) (optional): checksum
+ * @out_subdir: (out) (transfer full) (nullable) (optional): subdirectory
  * @error: a #GError
  */
 gboolean