From 45306c3a0107ae649613ce1704526c73e4ebdcde Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Jul 2004 22:52:06 +0000 Subject: [PATCH] Complete the g_log() family. (#135730, Sven Herzberg) Mon Jul 5 18:50:27 2004 Matthias Clasen * glib/gmessages.h (g_debug): Complete the g_log() family. (#135730, Sven Herzberg) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ docs/reference/ChangeLog | 5 +++++ docs/reference/glib/glib-sections.txt | 1 + docs/reference/glib/tmpl/messages.sgml | 7 +++++++ glib/gmessages.h | 15 +++++++++++++++ 9 files changed, 53 insertions(+) diff --git a/ChangeLog b/ChangeLog index abcab46..fd94f5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 5 18:50:27 2004 Matthias Clasen + + * glib/gmessages.h (g_debug): Complete the g_log() + family. (#135730, Sven Herzberg) + Mon Jul 5 18:42:30 2004 Matthias Clasen * glib/gnulib/Makefile.am (INCLUDES): Add top_srcdir to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index abcab46..fd94f5c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Jul 5 18:50:27 2004 Matthias Clasen + + * glib/gmessages.h (g_debug): Complete the g_log() + family. (#135730, Sven Herzberg) + Mon Jul 5 18:42:30 2004 Matthias Clasen * glib/gnulib/Makefile.am (INCLUDES): Add top_srcdir to diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index abcab46..fd94f5c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Mon Jul 5 18:50:27 2004 Matthias Clasen + + * glib/gmessages.h (g_debug): Complete the g_log() + family. (#135730, Sven Herzberg) + Mon Jul 5 18:42:30 2004 Matthias Clasen * glib/gnulib/Makefile.am (INCLUDES): Add top_srcdir to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index abcab46..fd94f5c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Jul 5 18:50:27 2004 Matthias Clasen + + * glib/gmessages.h (g_debug): Complete the g_log() + family. (#135730, Sven Herzberg) + Mon Jul 5 18:42:30 2004 Matthias Clasen * glib/gnulib/Makefile.am (INCLUDES): Add top_srcdir to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index abcab46..fd94f5c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Jul 5 18:50:27 2004 Matthias Clasen + + * glib/gmessages.h (g_debug): Complete the g_log() + family. (#135730, Sven Herzberg) + Mon Jul 5 18:42:30 2004 Matthias Clasen * glib/gnulib/Makefile.am (INCLUDES): Add top_srcdir to diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 176a324..d36fd42 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 5 18:49:56 2004 Matthias Clasen + + * glib/tmpl/messages.sgml: + * glib/glib-sections.txt: Add g_debug. + 2004-06-15 Federico Mena Quintero * glib/tmpl/conversions.sgml: New section on file name encodings. diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index b75c69e..30046a9 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -840,6 +840,7 @@ g_message g_warning g_critical g_error +g_debug g_log_set_handler diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml index 45b0c75..9af18fc 100644 --- a/docs/reference/glib/tmpl/messages.sgml +++ b/docs/reference/glib/tmpl/messages.sgml @@ -121,6 +121,13 @@ A convenience function/macro to log a warning message. @...: format string, followed by parameters to insert into the format string (as with printf()) + + +A convenience function/macro to log a debug message. + + +@...: format string, followed by parameters to insert into the format string (as with printf()) + Logs a "critical warning" (#G_LOG_LEVEL_CRITICAL). It's more or less diff --git a/glib/gmessages.h b/glib/gmessages.h index f3946ff..d47fdcf 100644 --- a/glib/gmessages.h +++ b/glib/gmessages.h @@ -123,6 +123,9 @@ void _g_log_fallback_handler (const gchar *log_domain, #define g_warning(...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_WARNING, \ __VA_ARGS__) +#define g_debug(...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_DEBUG, \ + __VA_ARGS__) #elif defined(G_HAVE_GNUC_VARARGS) #define g_error(format...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_ERROR, \ @@ -136,6 +139,9 @@ void _g_log_fallback_handler (const gchar *log_domain, #define g_warning(format...) g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_WARNING, \ format) +#define g_debug(format...) g_log (G_LOG_DOMAIN, \ + G_LOG_LEVEL_WARNING, \ + format) #else /* no varargs macros */ static void g_error (const gchar *format, @@ -173,6 +179,15 @@ g_warning (const gchar *format, g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, format, args); va_end (args); } +static void +g_debug (const gchar *format, + ...) +{ + va_list args; + va_start (args, format); + g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args); + va_end (args); +} #endif /* !__GNUC__ */ typedef void (*GPrintFunc) (const gchar *string); -- 2.7.4