diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-05 20:38:01 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-05 20:38:01 +0000 |
| commit | 2f3fbd451d2bed1737052c672974e3dc31ad015f (patch) | |
| tree | 0550a62ece5f6fab6919a68744902a141d293451 /dbus/dbus-internals.h | |
| parent | 6164a2e5f4ce528d902c8b55d4779204e91269ab (diff) | |
2003-04-05 Havoc Pennington <hp@pobox.com>
* doc/config-file.txt (Elements): fix docs of <auth> to reflect
reality; in fact multiple mechanisms are allowed.
* dbus/dbus-internals.c (_dbus_real_assert)
(_dbus_real_assert_not_reached): move guts of _dbus_assert() and
_dbus_assert_not_reached() into functions, so that they don't show
up in basic block counts for test coverage, and don't use up as
much disk space. Does mean slower execution speed though, so
assumes --disable-asserts is the normal production case.
Diffstat (limited to 'dbus/dbus-internals.h')
| -rw-r--r-- | dbus/dbus-internals.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 7e4138c9..dbfd0681 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -76,26 +76,22 @@ const char* _dbus_strerror (int error_number); #ifdef DBUS_DISABLE_ASSERT #define _dbus_assert(condition) #else +void _dbus_real_assert (dbus_bool_t condition, + const char *condition_text, + const char *file, + int line); #define _dbus_assert(condition) \ -do { \ - if (!(condition)) \ - { \ - _dbus_warn ("Assertion failed \"%s\" file \"%s\" line %d\n", \ - #condition, __FILE__, __LINE__); \ - _dbus_abort (); \ - } \ -} while (0) + _dbus_real_assert ((condition), #condition, __FILE__, __LINE__) #endif /* !DBUS_DISABLE_ASSERT */ #ifdef DBUS_DISABLE_ASSERT #define _dbus_assert_not_reached(explanation) #else +void _dbus_real_assert_not_reached (const char *explanation, + const char *file, + int line); #define _dbus_assert_not_reached(explanation) \ -do { \ - _dbus_warn ("File \"%s\" line %d should not have been reached: %s\n", \ - __FILE__, __LINE__, (explanation)); \ - _dbus_abort (); \ -} while (0) + _dbus_real_assert_not_reached (explanation, __FILE__, __LINE__) #endif /* !DBUS_DISABLE_ASSERT */ #define _DBUS_N_ELEMENTS(array) ((int) (sizeof ((array)) / sizeof ((array)[0]))) |