summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-09-29 20:45:26 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-09-29 20:45:26 -0400
commit2f93bea177a980b8ae750c07f3b269c9bea7ac25 (patch)
tree0a93e8a77c7063279a0d98fd61b1d2b7a6b1d6bb
parent442dadf3118cf3e2e9617461eb045f61483d58fc (diff)
Avoid a C99ism
Move a variable declaration to the beginning of the block; see bug 596561. Also remove a pointless register declaration.
-rw-r--r--glib/gmessages.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 0f4bf4211..9a3eec37d 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -435,11 +435,11 @@ g_logv (const gchar *log_domain,
log_level &= G_LOG_LEVEL_MASK;
if (!log_level)
return;
-
+
for (i = g_bit_nth_msf (log_level, -1); i >= 0; i = g_bit_nth_msf (log_level, i))
{
register GLogLevelFlags test_level;
-
+
test_level = 1 << i;
if (log_level & test_level)
{
@@ -448,6 +448,7 @@ g_logv (const gchar *log_domain,
GLogFunc log_func;
GLogLevelFlags domain_fatal_mask;
gpointer data = NULL;
+ gboolean masquerade_fatal = FALSE;
if (was_fatal)
test_level |= G_LOG_FLAG_FATAL;
@@ -491,7 +492,6 @@ g_logv (const gchar *log_domain,
}
}
- gboolean masquerade_fatal = FALSE;
if (test_level & G_LOG_FLAG_RECURSION)
{
/* we use a stack buffer of fixed size, since we're likely