summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 12:51:35 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:19:49 +0100
commitd0c187cc8cc78b661726dad8a75d20af595085f1 (patch)
tree4940c13a4f891127a4b4e426f10f25e340790ac2
parent7f656740d865bcdf77a49a41d47aedf401a80795 (diff)
OSL_TRACE: Use format string
-rw-r--r--bridges/source/jni_uno/jni_java2uno.cxx6
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx8
-rw-r--r--stoc/source/corereflection/crefl.cxx2
-rw-r--r--stoc/source/corereflection/lrucache.hxx6
-rw-r--r--stoc/source/security/access_controller.cxx6
-rw-r--r--stoc/source/security/lru_cache.h6
-rw-r--r--stoc/source/security/permissions.cxx4
-rw-r--r--stoc/source/tdmanager/lrucache.hxx6
-rw-r--r--stoc/test/javavm/testjavavm.cxx2
-rw-r--r--stoc/test/testconv.cxx2
-rw-r--r--stoc/test/testcorefl.cxx2
-rw-r--r--stoc/test/testintrosp.cxx2
12 files changed, 26 insertions, 26 deletions
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index f4cc3f14e1c2..63a9c0ad02ac 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -118,7 +118,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
OString cstr_msg(
OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_msg.getStr() );
+ OSL_TRACE( "%s", cstr_msg.getStr() );
}
#endif
// signal exception
@@ -422,7 +422,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
OString cstr_msg(
OUStringToOString(
trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_msg.getStr() );
+ OSL_TRACE( "%s", cstr_msg.getStr() );
}
#endif
@@ -688,7 +688,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
OUStringToOString(
OUSTR("freeing java uno proxy: ") + oid,
RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_msg.getStr() );
+ OSL_TRACE( "%s", cstr_msg.getStr() );
}
#endif
// revoke from uno env; has already been revoked from java env
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 45e1fed44aec..5fa8fa3e01b3 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -135,7 +135,7 @@ void Bridge::handle_java_exc(
OString cstr_trace(
OUStringToOString(
trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_trace.getStr() );
+ OSL_TRACE( "%s", cstr_trace.getStr() );
#endif
}
@@ -261,7 +261,7 @@ void Bridge::call_java(
OString cstr_trace(
OUStringToOString(
trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_trace.getStr() );
+ OSL_TRACE( "%s", cstr_trace.getStr() );
#endif
// complex return value
@@ -558,7 +558,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
OUStringToOString(
OUSTR("freeing binary uno proxy: ") + that->m_oid,
RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_msg.getStr() );
+ OSL_TRACE( "%s", cstr_msg.getStr() );
#endif
try
@@ -628,7 +628,7 @@ void SAL_CALL UNO_proxy_dispatch(
OString cstr_msg(
OUStringToOString(
trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( cstr_msg.getStr() );
+ OSL_TRACE( "%s", cstr_msg.getStr() );
#endif
try
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index b625d705a183..b126adb5103c 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -276,7 +276,7 @@ inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass(
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE( "### corereflection type unsupported: " );
OString aName( OUStringToOString( pTypeDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( aName.getStr() );
+ OSL_TRACE( "%s", aName.getStr() );
OSL_TRACE( "\n" );
#endif
return Reference< XIdlClass >();
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index 4e44d537cdcf..9a4b08746967 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -166,7 +166,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue( const t
toFront( pEntry );
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> retrieved element \"" );
- OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( "\" from cache <\n" );
#endif
return pEntry->aVal;
@@ -191,7 +191,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
if (pEntry->aKey.getLength())
{
OSL_TRACE( "> kicking element \"" );
- OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( "\" from cache <\n" );
}
#endif
@@ -203,7 +203,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
pEntry = (*iFind).second;
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> replacing element \"" );
- OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( "\" in cache <\n" );
#endif
}
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 529899a53aae..18ddc87b6425 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -616,13 +616,13 @@ static void dumpPermissions(
RTL_CONSTASCII_STRINGPARAM("> dumping default permissions:") );
}
OString str( ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
Sequence< OUString > permissions( collection.toStrings() );
OUString const * p = permissions.getConstArray();
for ( sal_Int32 nPos = 0; nPos < permissions.getLength(); ++nPos )
{
OString str( ::rtl::OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
}
OSL_TRACE( "> permission dump done" );
}
@@ -764,7 +764,7 @@ PermissionCollection AccessController::getEffectivePermissions(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"") );
OString str(
::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
#endif
return PermissionCollection( new AllPermission() );
}
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 4b7440e9dce8..123e0b181a19 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -203,7 +203,7 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
::rtl::OString str( ::rtl::OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
#endif
return &entry->m_val;
}
@@ -232,7 +232,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") );
::rtl::OString str( ::rtl::OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
}
#endif
m_key2element.erase( entry->m_key );
@@ -253,7 +253,7 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" in cache") );
::rtl::OString str( ::rtl::OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
#endif
}
entry->m_val = val;
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 23a99a1fd0da..c41643287020 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -89,7 +89,7 @@ static inline sal_Int32 makeMask(
buf.append( item );
::rtl::OString str( ::rtl::OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
}
#endif
}
@@ -580,7 +580,7 @@ static void demanded_diag(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" => ok.") );
::rtl::OString str(
::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( str.getStr() );
+ OSL_TRACE( "%s", str.getStr() );
}
#endif
//--------------------------------------------------------------------------------------------------
diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx
index 4f14fc7a2a91..36f3c62390c5 100644
--- a/stoc/source/tdmanager/lrucache.hxx
+++ b/stoc/source/tdmanager/lrucache.hxx
@@ -170,7 +170,7 @@ inline t_Val LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::getValue(
toFront( pEntry );
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> retrieved element \"" );
- OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( "\" from cache <\n" );
#endif
return pEntry->aVal;
@@ -195,7 +195,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
if (pEntry->aKey.getLength())
{
OSL_TRACE( "> kicking element \"" );
- OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( "\" from cache <\n" );
}
#endif
@@ -207,7 +207,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue(
pEntry = (*iFind).second;
#ifdef __CACHE_DIAGNOSE
OSL_TRACE( "> replacing element \"" );
- OSL_TRACE( ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ OSL_TRACE( "%s", ::rtl::OUStringToOString( pEntry->aKey, RTL_TEXTENCODING_ASCII_US ).getStr() );
OSL_TRACE( "\" in cache <\n" );
#endif
}
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index f3ff52851e7c..2cffe1541b66 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -158,7 +158,7 @@ SAL_IMPLEMENT_MAIN()
OSL_ENSURE( sal_False, "### exception occurred!" );
OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( aMsg.getStr() );
+ OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
}
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index d8c0dd359e6a..f847b855fe88 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -699,7 +699,7 @@ SAL_IMPLEMENT_MAIN()
OSL_ENSURE( sal_False, "### exception occurred!" );
OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( aMsg.getStr() );
+ OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
}
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 63bde05d44e2..e43687c92f5b 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -407,7 +407,7 @@ SAL_IMPLEMENT_MAIN()
OString aMsg(
OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( aMsg.getStr() );
+ OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
}
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 9a075333fac6..000d95279983 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1244,7 +1244,7 @@ SAL_IMPLEMENT_MAIN()
OSL_ENSURE( sal_False, "### exception occurred!" );
OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "### exception occurred: " );
- OSL_TRACE( aMsg.getStr() );
+ OSL_TRACE( "%s", aMsg.getStr() );
OSL_TRACE( "\n" );
}