From 667d49fd5cc4d5bd8551a88ef803badf70296c00 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 23 Dec 2019 10:37:01 +0200 Subject: sal_Char->char in test..testtools Change-Id: I060d5fc9124dc46b57400d108a889e4c879b5e8c Reviewed-on: https://gerrit.libreoffice.org/85731 Tested-by: Jenkins Reviewed-by: Noel Grandin --- testtools/source/bridgetest/bridgetest.cxx | 2 +- testtools/source/bridgetest/cppobj.cxx | 2 +- testtools/source/performance/ubobject.cxx | 2 +- testtools/source/performance/ubtest.cxx | 26 +++++++++++++------------- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'testtools/source') diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index c2b39378b8e6..6bae24fe1219 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -1214,7 +1214,7 @@ extern "C" { SAL_DLLPUBLIC_EXPORT void * component_getFactory( - const sal_Char * pImplName, void * pServiceManager, + const char * pImplName, void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { void * pRet = nullptr; diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 5cc360985609..1a0e1bfdf214 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -1128,7 +1128,7 @@ static Reference< XInterface > Test_Impl_create( extern "C" { SAL_DLLPUBLIC_EXPORT void * component_getFactory( - const sal_Char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager, + const char * pImplName, SAL_UNUSED_PARAMETER void * pServiceManager, SAL_UNUSED_PARAMETER void * ) { void * pRet = nullptr; diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 8aff1663ed9c..e437e9c9cdaa 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -252,7 +252,7 @@ sal_Bool SAL_CALL component_writeInfo( } SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index a45792a07a4b..c30f31ba7150 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -111,12 +111,12 @@ static inline sal_uInt32 getSystemTicks() } -static void out( const sal_Char * pText, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) +static void out( const char * pText, FILE * stream = stderr, + sal_Int32 nStart = -1, char cFillchar = ' ' ) { static sal_Int32 s_nPos = 0; - sal_Char ar[2] = { cFillchar, 0 }; + char ar[2] = { cFillchar, 0 }; while (s_nPos < nStart) { ::fprintf( stream, ar ); @@ -125,7 +125,7 @@ static void out( const sal_Char * pText, FILE * stream = stderr, ::fprintf( stream, pText ); - for ( const sal_Char * p = pText; *p; ++p ) + for ( const char * p = pText; *p; ++p ) { if (*p == '\n') s_nPos = 0; @@ -135,24 +135,24 @@ static void out( const sal_Char * pText, FILE * stream = stderr, } static inline void out( const OUString & rText, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) + sal_Int32 nStart = -1, char cFillchar = ' ' ) { OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) ); out( aText.getStr(), stream, nStart, cFillchar ); } static inline void out( double fVal, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) + sal_Int32 nStart = -1, char cFillchar = ' ' ) { - sal_Char ar[128]; + char ar[128]; ::snprintf( ar, sizeof(ar), (fVal < 0.000001 ? "%g" : "%f"), fVal ); out( ar, stream, nStart, cFillchar ); } static inline void out( sal_Int64 nVal, FILE * stream = stderr, - sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) + sal_Int32 nStart = -1, char cFillchar = ' ' ) { - sal_Char ar[128]; + char ar[128]; ::snprintf( ar, sizeof(ar), "%ld", nVal ); out( ar, stream, nStart, cFillchar ); } @@ -186,7 +186,7 @@ Reference< XSingleServiceFactory > loadLibComponentFactory( { uno_Environment * pCurrentEnv = 0; uno_Environment * pEnv = 0; - const sal_Char * pEnvTypeName = 0; + const char * pEnvTypeName = 0; (*((component_getImplementationEnvironmentFunc)pSym))( &pEnvTypeName, &pEnv ); sal_Bool bNeedsMapping = @@ -528,10 +528,10 @@ typedef std::map< std::string, TimeEntry > t_TimeEntryMap; struct TimingSheet { t_TimeEntryMap _entries; - void insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ); + void insert( const char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ); }; -void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ) +void TimingSheet::insert( const char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ) { _entries[ pText ] = TimeEntry( nLoop, nTicks ); } @@ -1249,7 +1249,7 @@ sal_Bool SAL_CALL component_writeInfo( } SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { void * pRet = 0; -- cgit