From d1c9e5ee53f8609092ea026639c8f28afec1d36a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 13 Mar 2015 18:20:18 +0100 Subject: tdf#43157: Fix format string violations in OSL_TRACE etc. ...for a 32-bit build, similar to what ee11e221d2108212619e1bbe7f029e7d9afdba32 "tdf#43157: Fix format string violations in OSL_TRACE etc." did for a 64-bit build Change-Id: I05dd79ede3e66cb9ab7a33792319eb34b34c82dd --- store/source/storbios.cxx | 2 +- store/source/storcach.cxx | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'store') diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index bea35d22c023..1e777ff178e1 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -657,7 +657,7 @@ void OStorePageBIOS::cleanup_Impl() if (m_ace_head.m_used > 0) { // Report remaining referer count. - OSL_TRACE("store::PageBIOS::cleanup_Impl(): referer count: %d", m_ace_head.m_used); + SAL_INFO("store", "referer count: " << m_ace_head.m_used); for (Ace * ace = m_ace_head.m_next; ace != &m_ace_head; ace = m_ace_head.m_next) { m_ace_head.m_used -= ace->m_used; diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index e4c348f29865..0bfa2200fcf1 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -23,6 +23,7 @@ #include "storcach.hxx" +#include "sal/log.hxx" #include "sal/types.h" #include "sal/macros.h" #include "rtl/alloc.h" @@ -335,8 +336,11 @@ void PageCache_Impl::rescale_Impl (sal_Size new_size) Entry ** old_table = m_hash_table; sal_Size old_size = m_hash_size; - OSL_TRACE("ave chain length: %zu, total entries: %zu [old_size: %zu new_size: %zu]", - m_hash_entries >> m_hash_shift, m_hash_entries, old_size, new_size); + SAL_INFO( + "store", + "ave chain length: " << (m_hash_entries >> m_hash_shift) + << ", total entries: " << m_hash_entries << " [old_size: " + << old_size << " new_size: " << new_size << "]"); memset (new_table, 0, new_bytes); -- cgit v1.2.3