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

Merge pull request #2233 from cgwalters/repo-annotations 

sysroot: Fix up some GI nullable annotations
This commit is contained in:
OpenShift Merge Robot 2020-11-09 18:56:24 +00:00 committed by GitHub
parent e43d445b5b bf8c4c7e32
commit 34390a53b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,9 +257,9 @@ ostree_sysroot_set_mount_namespace_in_use (OstreeSysroot *self)
/** /**
* ostree_sysroot_get_path: * ostree_sysroot_get_path:
* @self: * @self: Sysroot
* *
* Returns: (transfer none): Path to rootfs * Returns: (transfer none) (not nullable): Path to rootfs
*/ */
GFile * GFile *
ostree_sysroot_get_path (OstreeSysroot *self) ostree_sysroot_get_path (OstreeSysroot *self)
@ -1186,7 +1186,7 @@ ostree_sysroot_get_subbootversion (OstreeSysroot *self)
* ostree_sysroot_get_booted_deployment: * ostree_sysroot_get_booted_deployment:
* @self: Sysroot * @self: Sysroot
* *
* Returns: (transfer none): 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)
@ -1200,7 +1200,7 @@ ostree_sysroot_get_booted_deployment (OstreeSysroot *self)
* ostree_sysroot_get_staged_deployment: * ostree_sysroot_get_staged_deployment:
* @self: Sysroot * @self: Sysroot
* *
* Returns: (transfer none): The currently staged deployment, or %NULL if none * Returns: (transfer none) (nullable): The currently staged deployment, or %NULL if none
* *
* Since: 2018.5 * Since: 2018.5
*/ */
@ -1238,7 +1238,7 @@ ostree_sysroot_get_deployments (OstreeSysroot *self)
* to access, it, you must either use fd-relative api such as openat(), * to access, it, you must either use fd-relative api such as openat(),
* or concatenate it with the full ostree_sysroot_get_path(). * or concatenate it with the full ostree_sysroot_get_path().
* *
* Returns: (transfer full): Path to deployment root directory, relative to sysroot * Returns: (transfer full) (not nullable): Path to deployment root directory, relative to sysroot
*/ */
char * char *
ostree_sysroot_get_deployment_dirpath (OstreeSysroot *self, ostree_sysroot_get_deployment_dirpath (OstreeSysroot *self,
@ -1313,7 +1313,7 @@ ostree_sysroot_get_repo (OstreeSysroot *self,
* returns a cached repository. Can only be called after ostree_sysroot_initialize() * returns a cached repository. Can only be called after ostree_sysroot_initialize()
* or ostree_sysroot_load() has been invoked successfully. * or ostree_sysroot_load() has been invoked successfully.
* *
* Returns: (transfer none): The OSTree repository in sysroot @self. * Returns: (transfer none) (not nullable): The OSTree repository in sysroot @self.
* *
* Since: 2017.7 * Since: 2017.7
*/ */
@ -1356,7 +1356,7 @@ _ostree_sysroot_new_bootloader_by_type (
/** /**
* ostree_sysroot_query_bootloader: * ostree_sysroot_query_bootloader:
* @sysroot: Sysroot * @sysroot: Sysroot
* @out_bootloader: (out) (transfer full) (allow-none): Return location for bootloader, may be %NULL * @out_bootloader: (out) (transfer full) (optional) (nullable): Return location for bootloader, may be %NULL
* @cancellable: Cancellable * @cancellable: Cancellable
* @error: Error * @error: Error
*/ */
@ -1489,7 +1489,7 @@ ostree_sysroot_query_deployments_for (OstreeSysroot *self,
* Find the deployment to use as a configuration merge source; this is * Find the deployment to use as a configuration merge source; this is
* the first one in the current deployment list which matches osname. * the first one in the current deployment list which matches osname.
* *
* Returns: (transfer full): Configuration merge deployment * Returns: (transfer full) (nullable): Configuration merge deployment
*/ */
OstreeDeployment * OstreeDeployment *
ostree_sysroot_get_merge_deployment (OstreeSysroot *self, ostree_sysroot_get_merge_deployment (OstreeSysroot *self,
@ -1520,7 +1520,7 @@ ostree_sysroot_get_merge_deployment (OstreeSysroot *self,
* @self: Sysroot * @self: Sysroot
* @refspec: A refspec * @refspec: A refspec
* *
* Returns: (transfer full): A new config file which sets @refspec as an origin * Returns: (transfer full) (not nullable): A new config file which sets @refspec as an origin
*/ */
GKeyFile * GKeyFile *
ostree_sysroot_origin_new_from_refspec (OstreeSysroot *self, ostree_sysroot_origin_new_from_refspec (OstreeSysroot *self,