luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gmessages: make _g_log_abort() do only breakpoints again

Browse Source 
Commit e53caad4 makes _g_log_abort() noreturn by calling abort()
unconditionally.

However, it is useful to be able to skip some log_abort() with a
debugger, to reach a point of interest. Revert back to previous
behaviour. Make g_assert_warning() noreturn by calling abort().

https://bugzilla.gnome.org/show_bug.cgi?id=711800
This commit is contained in:
Marc-André Lureau 2013-12-03 15:35:50 +01:00
parent 2baa50ee4f
commit bff76bc36f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gmessages.c
View File

@ -290,7 +290,7 @@ static gpointer fatal_log_data;
/* --- functions --- */ /* --- functions --- */
static void _g_log_abort (gboolean breakpoint) G_GNUC_NORETURN; static void _g_log_abort (gboolean breakpoint);
static void static void
_g_log_abort (gboolean breakpoint) _g_log_abort (gboolean breakpoint)
@ -307,8 +307,8 @@ _g_log_abort (gboolean breakpoint)
if (breakpoint) if (breakpoint)
G_BREAKPOINT (); G_BREAKPOINT ();
else
abort (); abort ();
} }
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
@ -1130,6 +1130,7 @@ g_assert_warning (const char *log_domain,
pretty_function, pretty_function,
expression); expression);
_g_log_abort (FALSE); _g_log_abort (FALSE);
abort ();
} }
/** /**