Fix the types of some variables to be GLogLevelFlags instead of guint.

Sun Sep 19 23:52:35 2004  Matthias Clasen  <maclas@gmx.de>

	* glib/gmessages.c (mklevel_prefix):
	* glib/gmessages.c (g_logv): Fix the types of some variables
	to be GLogLevelFlags instead of guint.  (#153042, Philippe Blain)
This commit is contained in:
Matthias Clasen 2004-09-20 03:53:39 +00:00 committed by Matthias Clasen
parent 859b7b4959
commit b61e269d0d
6 changed files with 34 additions and 4 deletions

View File

@ -1,3 +1,9 @@
Sun Sep 19 23:52:35 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (mklevel_prefix):
* glib/gmessages.c (g_logv): Fix the types of some variables
to be GLogLevelFlags instead of guint. (#153042, Philippe Blain)
2004-09-18 Matthias Clasen <mclasen@redhat.com> 2004-09-18 Matthias Clasen <mclasen@redhat.com>
* Version bump * Version bump

View File

@ -1,3 +1,9 @@
Sun Sep 19 23:52:35 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (mklevel_prefix):
* glib/gmessages.c (g_logv): Fix the types of some variables
to be GLogLevelFlags instead of guint. (#153042, Philippe Blain)
2004-09-18 Matthias Clasen <mclasen@redhat.com> 2004-09-18 Matthias Clasen <mclasen@redhat.com>
* Version bump * Version bump

View File

@ -1,3 +1,9 @@
Sun Sep 19 23:52:35 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (mklevel_prefix):
* glib/gmessages.c (g_logv): Fix the types of some variables
to be GLogLevelFlags instead of guint. (#153042, Philippe Blain)
2004-09-18 Matthias Clasen <mclasen@redhat.com> 2004-09-18 Matthias Clasen <mclasen@redhat.com>
* Version bump * Version bump

View File

@ -1,3 +1,9 @@
Sun Sep 19 23:52:35 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (mklevel_prefix):
* glib/gmessages.c (g_logv): Fix the types of some variables
to be GLogLevelFlags instead of guint. (#153042, Philippe Blain)
2004-09-18 Matthias Clasen <mclasen@redhat.com> 2004-09-18 Matthias Clasen <mclasen@redhat.com>
* Version bump * Version bump

View File

@ -1,3 +1,9 @@
Sun Sep 19 23:52:35 2004 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (mklevel_prefix):
* glib/gmessages.c (g_logv): Fix the types of some variables
to be GLogLevelFlags instead of guint. (#153042, Philippe Blain)
2004-09-18 Matthias Clasen <mclasen@redhat.com> 2004-09-18 Matthias Clasen <mclasen@redhat.com>
* Version bump * Version bump

View File

@ -459,7 +459,7 @@ g_logv (const gchar *log_domain,
guint depth = GPOINTER_TO_UINT (g_private_get (g_log_depth)); guint depth = GPOINTER_TO_UINT (g_private_get (g_log_depth));
GLogDomain *domain; GLogDomain *domain;
GLogFunc log_func; GLogFunc log_func;
guint domain_fatal_mask; GLogLevelFlags domain_fatal_mask;
gpointer data = NULL; gpointer data = NULL;
if (was_fatal) if (was_fatal)
@ -488,7 +488,7 @@ g_logv (const gchar *log_domain,
/* had to defer debug initialization until we can keep track of recursion */ /* had to defer debug initialization until we can keep track of recursion */
if (!(test_level & G_LOG_FLAG_RECURSION) && !_g_debug_initialized) if (!(test_level & G_LOG_FLAG_RECURSION) && !_g_debug_initialized)
{ {
guint orig_test_level = test_level; GLogLevelFlags orig_test_level = test_level;
_g_debug_init (); _g_debug_init ();
if ((domain_fatal_mask | g_log_always_fatal) & test_level) if ((domain_fatal_mask | g_log_always_fatal) & test_level)
@ -706,8 +706,8 @@ format_unsigned (gchar *buf,
#define ALERT_LEVELS (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING) #define ALERT_LEVELS (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING)
static GFileDescriptor static GFileDescriptor
mklevel_prefix (gchar level_prefix[STRING_BUFFER_SIZE], mklevel_prefix (gchar level_prefix[STRING_BUFFER_SIZE],
guint log_level) GLogLevelFlags log_level)
{ {
gboolean to_stdout = TRUE; gboolean to_stdout = TRUE;