fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-06 17:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

internals: remove newline, pid from assertion failures

Browse source 
_dbus_warn() now calls _dbus_logv() which always logs the pid and
prints a newline anyway.

Signed-off-by: Simon McVittie <smcv@debian.org>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97009
This commit is contained in:
Simon McVittie 2016-07-21 10:55:59 +01:00
parent 7c837b1045
commit b8abdc52af
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dbus/dbus-internals.c
View file

@ -972,8 +972,8 @@ _dbus_real_assert (dbus_bool_t condition,
{
if (_DBUS_UNLIKELY (!condition))
{
_dbus_warn ("%lu: assertion failed \"%s\" file \"%s\" line %d function %s\n",
_dbus_pid_for_log (), condition_text, file, line, func);
_dbus_warn ("assertion failed \"%s\" file \"%s\" line %d function %s",
condition_text, file, line, func);
_dbus_abort ();
}
}
@ -993,8 +993,8 @@ _dbus_real_assert_not_reached (const char *explanation,
const char *file,
int line)
{
_dbus_warn ("File \"%s\" line %d process %lu should not have been reached: %s\n",
file, line, _dbus_pid_for_log (), explanation);
_dbus_warn ("File \"%s\" line %d should not have been reached: %s",
file, line, explanation);
_dbus_abort ();
}
#endif /* DBUS_DISABLE_ASSERT */