luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gmessages: Add g_info macro for G_LOG_LEVEL_INFO

Browse Source 
For completeness. Although less used than others, projects want
to use this, and end up having to define it awkwardly themselves.

https://bugzilla.gnome.org/show_bug.cgi?id=711103
This commit is contained in:
Stef Walter 2013-10-29 21:30:06 +01:00
parent a46459b000
commit 36f1a4ce7e
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/glib/glib-sections.txt
View File

@ -1072,6 +1072,7 @@ g_message
g_warning g_warning
g_critical g_critical
g_error g_error
g_info
g_debug g_debug
<SUBSECTION> <SUBSECTION>

22
glib/gmessages.c
View File

@ -146,7 +146,7 @@
* and g_return_val_if_fail(). * and g_return_val_if_fail().
* @G_LOG_LEVEL_WARNING: log level for warnings, see g_warning() * @G_LOG_LEVEL_WARNING: log level for warnings, see g_warning()
* @G_LOG_LEVEL_MESSAGE: log level for messages, see g_message() * @G_LOG_LEVEL_MESSAGE: log level for messages, see g_message()
* @G_LOG_LEVEL_INFO: log level for informational messages * @G_LOG_LEVEL_INFO: log level for informational messages, see g_info()
* @G_LOG_LEVEL_DEBUG: log level for debug messages, see g_debug() * @G_LOG_LEVEL_DEBUG: log level for debug messages, see g_debug()
* @G_LOG_LEVEL_MASK: a mask including all log levels * @G_LOG_LEVEL_MASK: a mask including all log levels
* *
@ -224,6 +224,23 @@
* *
*/ */
/**
* g_info:
* @...: format string, followed by parameters to insert
* into the format string (as with printf())
*
* A convenience function/macro to log an informational message. Seldom used.
*
* If g_log_default_handler() is used as the log handler function, a new-line
* character will automatically be appended to @..., and need not be entered
* manually.
*
* Such messages are suppressed by the g_log_default_handler() unless
* the G_MESSAGES_DEBUG environment variable is set appropriately.
*
* Since: 2.40
*/
/** /**
* g_debug: * g_debug:
* @...: format string, followed by parameters to insert * @...: format string, followed by parameters to insert
@ -235,6 +252,9 @@
* character will automatically be appended to @..., and need not be entered * character will automatically be appended to @..., and need not be entered
* manually. * manually.
* *
* Such messages are suppressed by the g_log_default_handler() unless
* the G_MESSAGES_DEBUG environment variable is set appropriately.
*
* Since: 2.6 * Since: 2.6
*/ */

15
glib/gmessages.h
View File

@ -164,6 +164,9 @@ void g_assert_warning (const char *log_domain,
#define g_warning(...) g_log (G_LOG_DOMAIN, \ #define g_warning(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_WARNING, \ G_LOG_LEVEL_WARNING, \
__VA_ARGS__) __VA_ARGS__)
#define g_info(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_INFO, \
__VA_ARGS__)
#define g_debug(...) g_log (G_LOG_DOMAIN, \ #define g_debug(...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \ G_LOG_LEVEL_DEBUG, \
__VA_ARGS__) __VA_ARGS__)
@ -184,6 +187,9 @@ void g_assert_warning (const char *log_domain,
#define g_warning(format...) g_log (G_LOG_DOMAIN, \ #define g_warning(format...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_WARNING, \ G_LOG_LEVEL_WARNING, \
format) format)
#define g_info(format...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_INFO, \
format)
#define g_debug(format...) g_log (G_LOG_DOMAIN, \ #define g_debug(format...) g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_DEBUG, \ G_LOG_LEVEL_DEBUG, \
format) format)
@ -230,6 +236,15 @@ g_warning (const gchar *format,
va_end (args); va_end (args);
} }
static void static void
g_info (const gchar *format,
...)
{
va_list args;
va_start (args, format);
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format, args);
va_end (args);
}
static void
g_debug (const gchar *format, g_debug (const gchar *format,
...) ...)
{ {

5
glib/tests/protocol.c
View File

@ -43,11 +43,8 @@ debug (void)
static void static void
info (void) info (void)
{ {
#ifdef g_info
#error "rewrite this to use g_info()"
#endif
if (g_test_subprocess ()) if (g_test_subprocess ())
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "this is a regular g_log(..., G_LOG_LEVEL_INFO, ...) from the test suite"); g_info ("this is a regular g_info from the test suite");
} }
static void static void