summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-mempool.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-05-09 04:15:56 +0000
committerHavoc Pennington <hp@redhat.com>2003-05-09 04:15:56 +0000
commit27b694f6e109c78c633ddb8d96f524e46e536f4e (patch)
tree43221b8d3bf80b347242f8904256152d6ccc0434 /dbus/dbus-mempool.c
parente2a1ff66c3374a4f60536e83a19b343e3700125f (diff)
2003-05-08 Havoc Pennington <hp@pobox.com>
* dbus/dbus-spawn.c: s/_exit/exit/ because it was keeping gcov data from getting written, and there wasn't a good reason to use _exit really. * test/decode-gcov.c (mark_inside_dbus_build_tests): don't count dbus_verbose lines in test coverage (main): add list of functions sorted by # of untested blocks to the coverage report * dbus/dbus-mempool.c: put some test-only code in DBUS_BUILD_TESTS * dbus/dbus-marshal.c (_dbus_marshal_test): extend test coverage * dbus/dbus-message-handler.c (_dbus_message_handler_test): extend test coverage * test/data/auth/cancel.auth-script: test canceling an authentication * dbus/Makefile.am: remove dbus-server-debug.[hc] for now, as they aren't used. in CVS history if we end up needing them.
Diffstat (limited to 'dbus/dbus-mempool.c')
-rw-r--r--dbus/dbus-mempool.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index 5074c7d2..a53a4886 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -207,6 +207,7 @@ _dbus_mem_pool_free (DBusMemPool *pool)
void*
_dbus_mem_pool_alloc (DBusMemPool *pool)
{
+#ifdef DBUS_BUILD_TESTS
if (_dbus_disable_mem_pools ())
{
DBusMemBlock *block;
@@ -239,6 +240,7 @@ _dbus_mem_pool_alloc (DBusMemPool *pool)
return NULL;
}
else
+#endif
{
if (_dbus_decrement_fail_alloc_counter ())
{
@@ -334,6 +336,7 @@ dbus_bool_t
_dbus_mem_pool_dealloc (DBusMemPool *pool,
void *element)
{
+#ifdef DBUS_BUILD_TESTS
if (_dbus_disable_mem_pools ())
{
DBusMemBlock *block;
@@ -371,6 +374,7 @@ _dbus_mem_pool_dealloc (DBusMemPool *pool,
return FALSE;
}
else
+#endif
{
DBusFreedElement *freed;