luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 10:38:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move the alloc_console_called static flag inside these two functions.

Browse Source 
2003-01-01  Tor Lillqvist  <tml@iki.fi>

	* glib/gmessages.c (ensure_stderr_valid, ensure_stdout_valid): Move the
	alloc_console_called static flag inside these two functions.
This commit is contained in:
Tor Lillqvist 2003-01-01 17:00:51 +00:00 committed by Tor Lillqvist
parent 7809df2a6a
commit ac17691afc
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,8 @@
2003-01-01 Tor Lillqvist <tml@iki.fi> 2003-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gmessages.c (ensure_stderr_valid): New function, parallel * glib/gmessages.c (ensure_stderr_valid): New function, parallel
to ensure_stdout_valid(). #defined as empty on Unix. to ensure_stdout_valid(). #defined as empty on Unix. Move the
alloc_console_called static flag inside these two functions.
(mklevel_prefix): Do use either stderr or stdout on Windows, (mklevel_prefix): Do use either stderr or stdout on Windows,
too. Otherwise g_warning() messages (that are just warnings, by too. Otherwise g_warning() messages (that are just warnings, by
definition) will get mixed with proper stdout output. Noticed in definition) will get mixed with proper stdout output. Noticed in

3
ChangeLog.pre-2-10
View File

@ -1,7 +1,8 @@
2003-01-01 Tor Lillqvist <tml@iki.fi> 2003-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gmessages.c (ensure_stderr_valid): New function, parallel * glib/gmessages.c (ensure_stderr_valid): New function, parallel
to ensure_stdout_valid(). #defined as empty on Unix. to ensure_stdout_valid(). #defined as empty on Unix. Move the
alloc_console_called static flag inside these two functions.
(mklevel_prefix): Do use either stderr or stdout on Windows, (mklevel_prefix): Do use either stderr or stdout on Windows,
too. Otherwise g_warning() messages (that are just warnings, by too. Otherwise g_warning() messages (that are just warnings, by
definition) will get mixed with proper stdout output. Noticed in definition) will get mixed with proper stdout output. Noticed in

3
ChangeLog.pre-2-12
View File

@ -1,7 +1,8 @@
2003-01-01 Tor Lillqvist <tml@iki.fi> 2003-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gmessages.c (ensure_stderr_valid): New function, parallel * glib/gmessages.c (ensure_stderr_valid): New function, parallel
to ensure_stdout_valid(). #defined as empty on Unix. to ensure_stdout_valid(). #defined as empty on Unix. Move the
alloc_console_called static flag inside these two functions.
(mklevel_prefix): Do use either stderr or stdout on Windows, (mklevel_prefix): Do use either stderr or stdout on Windows,
too. Otherwise g_warning() messages (that are just warnings, by too. Otherwise g_warning() messages (that are just warnings, by
definition) will get mixed with proper stdout output. Noticed in definition) will get mixed with proper stdout output. Noticed in

3
ChangeLog.pre-2-4
View File

@ -1,7 +1,8 @@
2003-01-01 Tor Lillqvist <tml@iki.fi> 2003-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gmessages.c (ensure_stderr_valid): New function, parallel * glib/gmessages.c (ensure_stderr_valid): New function, parallel
to ensure_stdout_valid(). #defined as empty on Unix. to ensure_stdout_valid(). #defined as empty on Unix. Move the
alloc_console_called static flag inside these two functions.
(mklevel_prefix): Do use either stderr or stdout on Windows, (mklevel_prefix): Do use either stderr or stdout on Windows,
too. Otherwise g_warning() messages (that are just warnings, by too. Otherwise g_warning() messages (that are just warnings, by
definition) will get mixed with proper stdout output. Noticed in definition) will get mixed with proper stdout output. Noticed in

3
ChangeLog.pre-2-6
View File

@ -1,7 +1,8 @@
2003-01-01 Tor Lillqvist <tml@iki.fi> 2003-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gmessages.c (ensure_stderr_valid): New function, parallel * glib/gmessages.c (ensure_stderr_valid): New function, parallel
to ensure_stdout_valid(). #defined as empty on Unix. to ensure_stdout_valid(). #defined as empty on Unix. Move the
alloc_console_called static flag inside these two functions.
(mklevel_prefix): Do use either stderr or stdout on Windows, (mklevel_prefix): Do use either stderr or stdout on Windows,
too. Otherwise g_warning() messages (that are just warnings, by too. Otherwise g_warning() messages (that are just warnings, by
definition) will get mixed with proper stdout output. Noticed in definition) will get mixed with proper stdout output. Noticed in

3
ChangeLog.pre-2-8
View File

@ -1,7 +1,8 @@
2003-01-01 Tor Lillqvist <tml@iki.fi> 2003-01-01 Tor Lillqvist <tml@iki.fi>
* glib/gmessages.c (ensure_stderr_valid): New function, parallel * glib/gmessages.c (ensure_stderr_valid): New function, parallel
to ensure_stdout_valid(). #defined as empty on Unix. to ensure_stdout_valid(). #defined as empty on Unix. Move the
alloc_console_called static flag inside these two functions.
(mklevel_prefix): Do use either stderr or stdout on Windows, (mklevel_prefix): Do use either stderr or stdout on Windows,
too. Otherwise g_warning() messages (that are just warnings, by too. Otherwise g_warning() messages (that are just warnings, by
definition) will get mixed with proper stdout output. Noticed in definition) will get mixed with proper stdout output. Noticed in

3
glib/gmessages.c
View File

@ -87,7 +87,6 @@ static GLogLevelFlags g_log_msg_prefix = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_WARNING
# include <windows.h> # include <windows.h>
# undef STRICT # undef STRICT
# include <process.h> /* For _getpid() */ # include <process.h> /* For _getpid() */
static gboolean alloc_console_called = FALSE;
static gboolean win32_keep_fatal_message = FALSE; static gboolean win32_keep_fatal_message = FALSE;
/* This default message will usually be overwritten. */ /* This default message will usually be overwritten. */
@ -122,6 +121,7 @@ dowrite (GFileDescriptor fd,
static void static void
ensure_stdout_valid (void) ensure_stdout_valid (void)
{ {
static gboolean alloc_console_called = FALSE;
HANDLE handle; HANDLE handle;
if (win32_keep_fatal_message) if (win32_keep_fatal_message)
@ -143,6 +143,7 @@ ensure_stdout_valid (void)
static void static void
ensure_stderr_valid (void) ensure_stderr_valid (void)
{ {
static gboolean alloc_console_called = FALSE;
HANDLE handle; HANDLE handle;
if (win32_keep_fatal_message) if (win32_keep_fatal_message)