luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 02:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-3552' into 'main'

Browse Source 
gmessages: Add nullable annotation for `log_domain` in `GLogFunc`

Closes #3552

See merge request GNOME/glib!4419
This commit is contained in:
Philip Withnall 2024-12-05 18:24:04 +00:00
commit f06352f841
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gmessages.c
View File

@ -129,7 +129,7 @@
/** /**
* GLogFunc: * GLogFunc:
* @log_domain: the log domain of the message * @log_domain: (nullable): the log domain of the message
* @log_level: the log level of the message (including the * @log_level: the log level of the message (including the
* fatal and recursion flags) * fatal and recursion flags)
* @message: the message to process * @message: the message to process
@ -143,6 +143,9 @@
* code do not need modifying to add a new-line character to the message if the * code do not need modifying to add a new-line character to the message if the
* log handler is changed. * log handler is changed.
* *
* The `log_domain` parameter can be set to `NULL` or an empty string to use the default
* application domain.
*
* This is not used if structured logging is enabled; see * This is not used if structured logging is enabled; see
* [Using Structured Logging](logging.html#using-structured-logging). * [Using Structured Logging](logging.html#using-structured-logging).
*/ */
@ -655,7 +658,7 @@ g_log_set_fatal_mask (const gchar *log_domain,
/** /**
* g_log_set_handler: * g_log_set_handler:
* @log_domain: (nullable): the log domain, or `NULL` for the default `""` * @log_domain: (nullable): the log domain
* application domain * application domain
* @log_levels: the log levels to apply the log handler for. * @log_levels: the log levels to apply the log handler for.
* To handle fatal and recursive messages as well, combine * To handle fatal and recursive messages as well, combine
@ -677,6 +680,9 @@ g_log_set_fatal_mask (const gchar *log_domain,
* This has no effect if structured logging is enabled; see * This has no effect if structured logging is enabled; see
* [Using Structured Logging](logging.html#using-structured-logging). * [Using Structured Logging](logging.html#using-structured-logging).
* *
* The `log_domain` parameter can be set to `NULL` or an empty string to use the default
* application domain.
*
* Here is an example for adding a log handler for all warning messages * Here is an example for adding a log handler for all warning messages
* in the default domain: * in the default domain:
* *
@ -712,7 +718,7 @@ g_log_set_handler (const gchar *log_domain,
/** /**
* g_log_set_handler_full: (rename-to g_log_set_handler) * g_log_set_handler_full: (rename-to g_log_set_handler)
* @log_domain: (nullable): the log domain, or `NULL` for the default `""` * @log_domain: (nullable): the log domain
* application domain * application domain
* @log_levels: the log levels to apply the log handler for. * @log_levels: the log levels to apply the log handler for.
* To handle fatal and recursive messages as well, combine * To handle fatal and recursive messages as well, combine
@ -727,6 +733,9 @@ g_log_set_handler (const gchar *log_domain,
* This has no effect if structured logging is enabled; see * This has no effect if structured logging is enabled; see
* [Using Structured Logging](logging.html#using-structured-logging). * [Using Structured Logging](logging.html#using-structured-logging).
* *
* The `log_domain` parameter can be set to `NULL` or an empty string to use the default
* application domain.
*
* Returns: the ID of the new handler * Returns: the ID of the new handler
* *
* Since: 2.46 * Since: 2.46
@ -1125,7 +1134,7 @@ static GSList *expected_messages = NULL;
/** /**
* g_logv: * g_logv:
* @log_domain: (nullable): the log domain, or `NULL` for the default `""` * @log_domain: (nullable): the log domain
* application domain * application domain
* @log_level: the log level * @log_level: the log level
* @format: the message format. See the `printf()` documentation * @format: the message format. See the `printf()` documentation
@ -1143,6 +1152,9 @@ static GSList *expected_messages = NULL;
* *
* If [structured logging is enabled](logging.html#using-structured-logging) this will * If [structured logging is enabled](logging.html#using-structured-logging) this will
* output via the structured log writer function (see [func@GLib.log_set_writer_func]). * output via the structured log writer function (see [func@GLib.log_set_writer_func]).
*
* The `log_domain` parameter can be set to `NULL` or an empty string to use the default
* application domain.
*/ */
void void
g_logv (const gchar *log_domain, g_logv (const gchar *log_domain,