luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-08 10:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another variadic macro fix

Browse Source 
It turns out that g_info_structured (format, ...) makes
g_info_structured ("Hey!") not work, since it requires at
least one argument after the format string. So shorten
the argument list to just ...
This commit is contained in:
Matthias Clasen 2016-07-17 02:31:37 -04:00
parent 17f48d7144
commit 42725fb17d
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
glib/gmessages.h
View File

@ -258,12 +258,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
* *
* Since: 2.50 * Since: 2.50
*/ */
#define g_debug_structured(format, ...) \ #define g_debug_structured(...) \
g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
format, __VA_ARGS__, \ __VA_ARGS__, \
"CODE_FILE", G_STRINGIFY (__FILE__), \ "CODE_FILE", __FILE__, \
"CODE_LINE", G_STRINGIFY (__LINE__), \ "CODE_LINE", G_STRINGIFY (__LINE__), \
"CODE_FUNC", G_STRINGIFY (__FUNC__), \ "CODE_FUNC", __func__, \
NULL) NULL)
/** /**
@ -280,12 +280,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
* *
* Since: 2.50 * Since: 2.50
*/ */
#define g_info_structured(format, ...) \ #define g_info_structured(...) \
g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, \ g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, \
format, __VA_ARGS__, \ __VA_ARGS__, \
"CODE_FILE", G_STRINGIFY (__FILE__), \ "CODE_FILE", __FILE__, \
"CODE_LINE", G_STRINGIFY (__LINE__), \ "CODE_LINE", G_STRINGIFY (__LINE__), \
"CODE_FUNC", G_STRINGIFY (__FUNC__), \ "CODE_FUNC", __func__, \
NULL) NULL)
/** /**
@ -302,12 +302,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
* *
* Since: 2.50 * Since: 2.50
*/ */
#define g_message_structured(format, ...) \ #define g_message_structured(...) \
g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, \ g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, \
format, __VA_ARGS__, \ __VA_ARGS__, \
"CODE_FILE", G_STRINGIFY (__FILE__), \ "CODE_FILE", __FILE__, \
"CODE_LINE", G_STRINGIFY (__LINE__), \ "CODE_LINE", G_STRINGIFY (__LINE__), \
"CODE_FUNC", G_STRINGIFY (__FUNC__), \ "CODE_FUNC", __func__, \
NULL) NULL)
@ -325,12 +325,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
* *
* Since: 2.50 * Since: 2.50
*/ */
#define g_warning_structured(format, ...) \ #define g_warning_structured(...) \
g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, \ g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, \
format, __VA_ARGS__, \ __VA_ARGS__, \
"CODE_FILE", G_STRINGIFY (__FILE__), \ "CODE_FILE", __FILE__, \
"CODE_LINE", G_STRINGIFY (__LINE__), \ "CODE_LINE", G_STRINGIFY (__LINE__), \
"CODE_FUNC", G_STRINGIFY (__FUNC__), \ "CODE_FUNC", __func__, \
NULL) NULL)
/** /**
@ -347,12 +347,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
* *
* Since: 2.50 * Since: 2.50
*/ */
#define g_critical_structured(format, ...) \ #define g_critical_structured(...) \
g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \ g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
format, __VA_ARGS__, \ __VA_ARGS__, \
"CODE_FILE", G_STRINGIFY (__FILE__), \ "CODE_FILE", __FILE__, \
"CODE_LINE", G_STRINGIFY (__LINE__), \ "CODE_LINE", G_STRINGIFY (__LINE__), \
"CODE_FUNC", G_STRINGIFY (__FUNC__), \ "CODE_FUNC", __func__, \
NULL) NULL)
/** /**
@ -369,12 +369,12 @@ GLogWriterOutput g_log_writer_default (GLogLevelFlags log_level,
* *
* Since: 2.50 * Since: 2.50
*/ */
#define g_error_structured(format, ...) \ #define g_error_structured(...) \
g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \ g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \
format, __VA_ARGS__, \ __VA_ARGS__, \
"CODE_FILE", G_STRINGIFY (__FILE__), \ "CODE_FILE", __FILE__, \
"CODE_LINE", G_STRINGIFY (__LINE__), \ "CODE_LINE", G_STRINGIFY (__LINE__), \
"CODE_FUNC", G_STRINGIFY (__FUNC__), \ "CODE_FUNC", __func__, \
NULL) NULL)
/* internal */ /* internal */