diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-07-03 18:58:42 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-07-05 13:12:37 +0100 |
| commit | 0354f5d48fd204bb891946a2baf82290497b44c9 (patch) | |
| tree | 7d5f1f8e2ef52a20998a73deb65c38851a078b92 /dbus/dbus-internals.c | |
| parent | 2135910d316513efdde69ee3e506a70626b467a3 (diff) | |
| download | dbus-0354f5d48fd204bb891946a2baf82290497b44c9.tar.gz | |
internals: Decouple logging an error from exiting unsuccessfully
This lets _dbus_warn() and _dbus_warn_check_failed() fall through
to flushing stderr and calling _dbus_abort(), meaning that failed
checks and warnings can result in a core dump as intended.
By renaming the FATAL severity to ERROR, we ensure that any code
contributions that assumed the old semantics will fail to compile.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101568
Diffstat (limited to 'dbus/dbus-internals.c')
| -rw-r--r-- | dbus/dbus-internals.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index bc3454d5..267aef97 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -237,7 +237,7 @@ _dbus_warn (const char *format, init_warnings (); if (fatal_warnings) - severity = DBUS_SYSTEM_LOG_FATAL; + severity = DBUS_SYSTEM_LOG_ERROR; va_start (args, format); _dbus_logv (severity, format, args); @@ -269,7 +269,7 @@ _dbus_warn_check_failed(const char *format, init_warnings (); if (fatal_warnings_on_check_failed) - severity = DBUS_SYSTEM_LOG_FATAL; + severity = DBUS_SYSTEM_LOG_ERROR; va_start (args, format); _dbus_logv (severity, format, args); |