luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-12 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the 1024 char limit in the common (non-recursive) case.

Browse Source 
2003-07-26  Matthias Clasen  <maclas@gmx.de>

	* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
	case.
This commit is contained in:
Matthias Clasen 2003-07-25 23:17:23 +00:00 committed by Matthias Clasen
parent a412fb1654
commit ffa186dfc9
9 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
case.
2003-07-25 Matthias Clasen <maclas@gmx.de> 2003-07-25 Matthias Clasen <maclas@gmx.de>
* glib/gwin32.c: * glib/gwin32.c:

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
case.
2003-07-25 Matthias Clasen <maclas@gmx.de> 2003-07-25 Matthias Clasen <maclas@gmx.de>
* glib/gwin32.c: * glib/gwin32.c:

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
case.
2003-07-25 Matthias Clasen <maclas@gmx.de> 2003-07-25 Matthias Clasen <maclas@gmx.de>
* glib/gwin32.c: * glib/gwin32.c:

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
case.
2003-07-25 Matthias Clasen <maclas@gmx.de> 2003-07-25 Matthias Clasen <maclas@gmx.de>
* glib/gwin32.c: * glib/gwin32.c:

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
case.
2003-07-25 Matthias Clasen <maclas@gmx.de> 2003-07-25 Matthias Clasen <maclas@gmx.de>
* glib/gwin32.c: * glib/gwin32.c:

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.c (g_logv): Remove the 1024 char limit in the common (non-recursive)
case.
2003-07-25 Matthias Clasen <maclas@gmx.de> 2003-07-25 Matthias Clasen <maclas@gmx.de>
* glib/gwin32.c: * glib/gwin32.c:

4
docs/reference/ChangeLog
View File

@ -1,3 +1,7 @@
2003-07-26 Matthias Clasen <maclas@gmx.de>
* glib/tmpl/messages.sgml: Remove the note about the message length restriction.
2003-07-24 Matthias Clasen <maclas@gmx.de> 2003-07-24 Matthias Clasen <maclas@gmx.de>
* glib/tmpl/messages.sgml: Mention the restriction on message length. (#118043, Martyn Russell) * glib/tmpl/messages.sgml: Mention the restriction on message length. (#118043, Martyn Russell)

4
docs/reference/glib/tmpl/messages.sgml
View File

@ -9,10 +9,6 @@ versatile support for logging messages with different levels of importance.
These functions provide support for logging error messages or messages used for debugging. These functions provide support for logging error messages or messages used for debugging.
</para> </para>
<para>
Note that the formatted messages must not exceed 1024 bytes. Longer messages will be truncated.
</para>
<para> <para>
There are several built-in levels of messages, defined in #GLogLevelFlags. There are several built-in levels of messages, defined in #GLogLevelFlags.
These can be extended with user-defined levels. These can be extended with user-defined levels.

24
glib/gmessages.c
View File

@ -422,7 +422,6 @@ g_logv (const gchar *log_domain,
const gchar *format, const gchar *format,
va_list args1) va_list args1)
{ {
gchar buffer[1025];
gboolean was_fatal = (log_level & G_LOG_FLAG_FATAL) != 0; gboolean was_fatal = (log_level & G_LOG_FLAG_FATAL) != 0;
gboolean was_recursion = (log_level & G_LOG_FLAG_RECURSION) != 0; gboolean was_recursion = (log_level & G_LOG_FLAG_RECURSION) != 0;
gint i; gint i;
@ -431,11 +430,6 @@ g_logv (const gchar *log_domain,
if (!log_level) if (!log_level)
return; return;
/* we use a stack buffer of fixed size, because we might get called
* recursively.
*/
_g_vsnprintf (buffer, 1024, format, args1);
for (i = g_bit_nth_msf (log_level, -1); i >= 0; i = g_bit_nth_msf (log_level, i)) for (i = g_bit_nth_msf (log_level, -1); i >= 0; i = g_bit_nth_msf (log_level, i))
{ {
register GLogLevelFlags test_level; register GLogLevelFlags test_level;
@ -491,7 +485,25 @@ g_logv (const gchar *log_domain,
} }
} }
if (test_level & G_LOG_FLAG_RECURSION)
{
/* we use a stack buffer of fixed size, since we're likely
* in an out-of-memory situation
*/
gchar buffer[1025];
gint size;
size = _g_vsnprintf (buffer, 1024, format, args1);
log_func (log_domain, test_level, buffer, data); log_func (log_domain, test_level, buffer, data);
}
else
{
gchar *msg = g_strdup_vprintf (format, args1);
log_func (log_domain, test_level, msg, data);
g_free (msg);
}
if (test_level & G_LOG_FLAG_FATAL) if (test_level & G_LOG_FLAG_FATAL)
{ {