luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 17:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/sophie-h/fd-list-nullable' into 'main'

Browse Source 
gdbus: Add nullable annotations for fd list outs

See merge request GNOME/glib!4429
This commit is contained in:
Marco Trevisan
2024-12-10 21:41:00 +00:00
parent a5f68ba494 8be0a9af5b
commit 8447052fe3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gdbus-2.0/codegen/codegen.py
View File

@@ -2835,7 +2835,7 @@ class CodeGenerator:
) )
if m.unix_fd: if m.unix_fd:
self.outfile.write( self.outfile.write(
" * @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL to ignore.\n" " * @out_fd_list: (out) (optional) (nullable): Return location for a #GUnixFDList or %NULL to ignore.\n"
) )
self.outfile.write( self.outfile.write(
self.docbook_gen.expand( self.docbook_gen.expand(
@@ -2913,7 +2913,7 @@ class CodeGenerator:
) )
if m.unix_fd: if m.unix_fd:
self.outfile.write( self.outfile.write(
" * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL.\n" " * @out_fd_list: (out) (optional) (nullable): Return location for a #GUnixFDList or %NULL.\n"
) )
self.outfile.write( self.outfile.write(
self.docbook_gen.expand( self.docbook_gen.expand(

4
gio/gdbusconnection.c
View File

@@ -6867,7 +6867,7 @@ g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection,
/** /**
* g_dbus_connection_call_with_unix_fd_list_finish: * g_dbus_connection_call_with_unix_fd_list_finish:
* @connection: a #GDBusConnection * @connection: a #GDBusConnection
* @out_fd_list: (out) (optional): return location for a #GUnixFDList or %NULL * @out_fd_list: (out) (optional) (nullable): return location for a #GUnixFDList or %NULL
* @res: a #GAsyncResult obtained from the #GAsyncReadyCallback passed to * @res: a #GAsyncResult obtained from the #GAsyncReadyCallback passed to
* g_dbus_connection_call_with_unix_fd_list() * g_dbus_connection_call_with_unix_fd_list()
* @error: return location for error or %NULL * @error: return location for error or %NULL
@@ -6914,7 +6914,7 @@ g_dbus_connection_call_with_unix_fd_list_finish (GDBusConnection *connection,
* @timeout_msec: the timeout in milliseconds, -1 to use the default * @timeout_msec: the timeout in milliseconds, -1 to use the default
* timeout or %G_MAXINT for no timeout * timeout or %G_MAXINT for no timeout
* @fd_list: (nullable): a #GUnixFDList or %NULL * @fd_list: (nullable): a #GUnixFDList or %NULL
* @out_fd_list: (out) (optional): return location for a #GUnixFDList or %NULL * @out_fd_list: (out) (optional) (nullable): return location for a #GUnixFDList or %NULL
* @cancellable: (nullable): a #GCancellable or %NULL * @cancellable: (nullable): a #GCancellable or %NULL
* @error: return location for error or %NULL * @error: return location for error or %NULL
* *

4
gio/gdbusproxy.c
View File

@@ -3065,7 +3065,7 @@ g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy,
/** /**
* g_dbus_proxy_call_with_unix_fd_list_finish: * g_dbus_proxy_call_with_unix_fd_list_finish:
* @proxy: A #GDBusProxy. * @proxy: A #GDBusProxy.
* @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL. * @out_fd_list: (out) (optional) (nullable): Return location for a #GUnixFDList or %NULL.
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to g_dbus_proxy_call_with_unix_fd_list(). * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to g_dbus_proxy_call_with_unix_fd_list().
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* *
@@ -3095,7 +3095,7 @@ g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy,
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning * @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout. * "infinite") or -1 to use the proxy default timeout.
* @fd_list: (nullable): A #GUnixFDList or %NULL. * @fd_list: (nullable): A #GUnixFDList or %NULL.
* @out_fd_list: (out) (optional): Return location for a #GUnixFDList or %NULL. * @out_fd_list: (out) (optional) (nullable): Return location for a #GUnixFDList or %NULL.
* @cancellable: (nullable): A #GCancellable or %NULL. * @cancellable: (nullable): A #GCancellable or %NULL.
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* *