diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 13:29:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-19 19:17:57 +0100 |
| commit | e994b3fc3b2c9b7d39a715fc4d9453e06434d457 (patch) | |
| tree | 444fc710a7e31168bba36319f65a862d393c69e6 | |
| parent | 7c18da2dc6963b6f3f74a72fc4f6a3eedd8f9eb7 (diff) | |
sal_Char->char in remotebridges..sax
Change-Id: I6d32942960a5e997f16eb1301c45495661cd4cea
Reviewed-on: https://gerrit.libreoffice.org/85514
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
59 files changed, 583 insertions, 583 deletions
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 7484a2491725..223bd868192d 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -83,8 +83,8 @@ public: maAttributeValues.reserve(nNumTokens+1); maAttributeTokens.reserve(nNumTokens); } - void add( sal_Int32 nToken, const sal_Char* pValue ); - void add( sal_Int32 nToken, const sal_Char* pValue, size_t nValueLength ); + void add( sal_Int32 nToken, const char* pValue ); + void add( sal_Int32 nToken, const char* pValue, size_t nValueLength ); void add( sal_Int32 nToken, const OString& rValue ); void addNS( sal_Int32 nNamespaceToken, sal_Int32 nToken, const OString& rValue ); // note: rQName is *namespace-prefixed* @@ -200,7 +200,7 @@ public: FastAttributeIter find( sal_Int32 nToken ) const; private: - sal_Char *mpChunk; ///< buffer to store all attribute values - null terminated strings + char *mpChunk; ///< buffer to store all attribute values - null terminated strings sal_Int32 mnChunkLength; ///< size of allocated memory for mpChunk // maAttributeValues stores pointers, relative to mpChunk, for each attribute value string // length of the string is maAttributeValues[n+1] - maAttributeValues[n] - 1 diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index ddafd346bc7e..4339b30a6dab 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -153,7 +153,7 @@ static const struct ImplementationEntry g_entries[] = }; extern "C" SAL_DLLPUBLIC_EXPORT void * uuresolver_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + const char * pImplName, void * pServiceManager, void * pRegistryKey ) { return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries ); } diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 436550c9aa3f..9c8c25033e21 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -131,8 +131,8 @@ namespace reportdesign bool WriteThroughComponent( /// the component we export const css::uno::Reference< css::lang::XComponent> & xComponent, - const sal_Char* pStreamName, /// the stream name - const sal_Char* pServiceName, /// service name of the component + const char* pStreamName, /// the stream name + const char* pServiceName, /// service name of the component /// the argument (XInitialization) const css::uno::Sequence< css::uno::Any> & rArguments, /// output descriptor @@ -144,7 +144,7 @@ namespace reportdesign bool WriteThroughComponent( const css::uno::Reference< css::io::XOutputStream> & xOutputStream, const css::uno::Reference< css::lang::XComponent> & xComponent, - const sal_Char* pServiceName, + const char* pServiceName, const css::uno::Sequence< css::uno::Any> & rArguments, const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc); diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 320506cafb2b..12b84f95ee42 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -38,7 +38,7 @@ namespace rptui const OUString m_sPattern; public: - ConditionalExpression( const sal_Char* _pAsciiPattern ); + ConditionalExpression( const char* _pAsciiPattern ); /** assembles an expression string from a field data source, and one or two operands */ diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 296419e4f2db..8fcf9e1b9e3e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1457,8 +1457,8 @@ void SAL_CALL OReportDefinition::removeStorageChangeListener( const uno::Referen bool OReportDefinition::WriteThroughComponent( const uno::Reference<lang::XComponent> & xComponent, - const sal_Char* pStreamName, - const sal_Char* pServiceName, + const char* pStreamName, + const char* pServiceName, const uno::Sequence<uno::Any> & rArguments, const uno::Sequence<beans::PropertyValue> & rMediaDesc, const uno::Reference<embed::XStorage>& _xStorageToSaveTo) @@ -1504,7 +1504,7 @@ bool OReportDefinition::WriteThroughComponent( bool OReportDefinition::WriteThroughComponent( const uno::Reference<io::XOutputStream> & xOutputStream, const uno::Reference<lang::XComponent> & xComponent, - const sal_Char* pServiceName, + const char* pServiceName, const uno::Sequence<uno::Any> & rArguments, const uno::Sequence<beans::PropertyValue> & rMediaDesc) { diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index dc25d4b50bfc..25ccd140a6d6 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -28,7 +28,7 @@ namespace rptui // = ConditionalExpression - ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern ) + ConditionalExpression::ConditionalExpression( const char* _pAsciiPattern ) :m_sPattern( OUString::createFromAscii( _pAsciiPattern ) ) { } diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index b39b315ce13b..0787a313c5d7 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -184,8 +184,8 @@ static ErrCode ReadThroughComponent( static ErrCode ReadThroughComponent( const uno::Reference< embed::XStorage >& xStorage, const uno::Reference<XComponent>& xModelComponent, - const sal_Char* pStreamName, - const sal_Char* pCompatibilityStreamName, + const char* pStreamName, + const char* pCompatibilityStreamName, const uno::Reference<XComponentContext> & rxContext, const Reference<document::XGraphicStorageHandler> & rxGraphicStorageHandler, const Reference<document::XEmbeddedObjectResolver>& _xEmbeddedObjectResolver, diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 986bf85df88c..f659099e2b66 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -177,7 +177,7 @@ namespace rptui const struct { - const sal_Char* programmaticName; + const char* programmaticName; const char* uiNameResId; OString const helpId; } aCategories[] = { diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index ab52f063f2ca..5f2ea6b38cfc 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -572,7 +572,7 @@ namespace template< class ATTRIBUTE_TYPE > - void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, + void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, void (SAL_CALL report::XReportControlFormat::*pSetter)( ATTRIBUTE_TYPE ) ) { @@ -582,7 +582,7 @@ namespace } - void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, + void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, void (SAL_CALL report::XReportControlFormat::*pSetter)( const OUString& ) ) { @@ -592,7 +592,7 @@ namespace } - void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, + void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, void (SAL_CALL report::XReportControlFormat::*pSetter)( const lang::Locale& ) ) { diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx index dd47debea6ec..406c39229397 100644 --- a/sal/osl/all/compat.cxx +++ b/sal/osl/all/compat.cxx @@ -150,7 +150,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_zeroMemory(void *, sal_Size) { std::abort(); } -SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_logfile_trace( const sal_Char*, ... ) { +SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_logfile_trace( const char*, ... ) { std::abort(); } diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 7b6ec7457e94..f9f316d8b5fb 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -144,7 +144,7 @@ oslFileType DirectoryItem_Impl::getFileType() const static oslFileError osl_psz_createDirectory( char const * pszPath, sal_uInt32 flags); -static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath); +static oslFileError osl_psz_removeDirectory(const char* pszPath); oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirectory* pDirectory) { @@ -476,7 +476,7 @@ oslFileError osl_psz_createDirectory(char const * pszPath, sal_uInt32 flags) return osl_File_E_None; } -static oslFileError osl_psz_removeDirectory( const sal_Char* pszPath ) +static oslFileError osl_psz_removeDirectory( const char* pszPath ) { int nRet = rmdir(pszPath); @@ -578,15 +578,15 @@ oslFileError SAL_CALL osl_createDirectoryPath( return create_dir_recursively_(sys_path.pData->buffer, aDirectoryCreationCallbackFunc, pData); } -static oslFileError osl_unlinkFile(const sal_Char* pszPath); -static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath, bool preserveMetadata); -static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath); +static oslFileError osl_unlinkFile(const char* pszPath); +static oslFileError osl_psz_copyFile(const char* pszPath, const char* pszDestPath, bool preserveMetadata); +static oslFileError osl_psz_moveFile(const char* pszPath, const char* pszDestPath); -static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, bool DestFileExists); -static void attemptChangeMetadata(const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID); -static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName); -static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode); -static oslFileError oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath); +static oslFileError oslDoCopy(const char* pszSourceFileName, const char* pszDestFileName, mode_t nMode, size_t nSourceSize, bool DestFileExists); +static void attemptChangeMetadata(const char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID); +static int oslDoCopyLink(const char* pszSourceFileName, const char* pszDestFileName); +static int oslDoCopyFile(const char* pszSourceFileName, const char* pszDestFileName, size_t nSourceSize, mode_t mode); +static oslFileError oslDoMoveFile(const char* pszPath, const char* pszDestPath); oslFileError SAL_CALL osl_moveFile( rtl_uString* ustrFileURL, rtl_uString* ustrDestURL ) { @@ -699,7 +699,7 @@ oslFileError SAL_CALL osl_removeFile(rtl_uString* ustrFileURL) return osl_unlinkFile(path); } -static oslFileError oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDestPath) +static oslFileError oslDoMoveFile(const char* pszPath, const char* pszDestPath) { oslFileError tErr = osl_psz_moveFile(pszPath,pszDestPath); if (tErr == osl_File_E_None) @@ -721,7 +721,7 @@ static oslFileError oslDoMoveFile(const sal_Char* pszPath, const sal_Char* pszDe return tErr; } -static oslFileError osl_unlinkFile(const sal_Char* pszPath) +static oslFileError osl_unlinkFile(const char* pszPath) { int nRet=0; struct stat aStat; @@ -749,7 +749,7 @@ static oslFileError osl_unlinkFile(const sal_Char* pszPath) return osl_File_E_None; } -static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath) +static oslFileError osl_psz_moveFile(const char* pszPath, const char* pszDestPath) { int nRet = rename(pszPath,pszDestPath); @@ -765,7 +765,7 @@ static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* ps return osl_File_E_None; } -static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* pszDestPath, bool preserveMetadata ) +static oslFileError osl_psz_copyFile( const char* pszPath, const char* pszDestPath, bool preserveMetadata ) { time_t nAcTime=0; time_t nModTime=0; @@ -832,7 +832,7 @@ static oslFileError osl_psz_copyFile( const sal_Char* pszPath, const sal_Char* p return tErr; } -static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, mode_t nMode, size_t nSourceSize, bool DestFileExists) +static oslFileError oslDoCopy(const char* pszSourceFileName, const char* pszDestFileName, mode_t nMode, size_t nSourceSize, bool DestFileExists) { int nRet=0; @@ -913,7 +913,7 @@ static oslFileError oslDoCopy(const sal_Char* pszSourceFileName, const sal_Char* return osl_File_E_None; } -void attemptChangeMetadata( const sal_Char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID) +void attemptChangeMetadata( const char* pszFileName, mode_t nMode, time_t nAcTime, time_t nModTime, uid_t nUID, gid_t nGID) { struct utimbuf aTimeBuffer; @@ -954,13 +954,13 @@ void attemptChangeMetadata( const sal_Char* pszFileName, mode_t nMode, time_t nA SAL_INFO("sal.file", "lchown(" << pszFileName << "): OK"); } -static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName) +static int oslDoCopyLink(const char* pszSourceFileName, const char* pszDestFileName) { int nRet=0; /* mfe: if dest file is symbolic link remove the link and place the file instead (hro says so) */ /* mfe: if source is a link copy the link and not the file it points to (hro says so) */ - sal_Char pszLinkContent[PATH_MAX+1]; + char pszLinkContent[PATH_MAX+1]; pszLinkContent[0] = '\0'; @@ -985,7 +985,7 @@ static int oslDoCopyLink(const sal_Char* pszSourceFileName, const sal_Char* pszD return 0; } -static int oslDoCopyFile(const sal_Char* pszSourceFileName, const sal_Char* pszDestFileName, size_t nSourceSize, mode_t mode) +static int oslDoCopyFile(const char* pszSourceFileName, const char* pszDestFileName, size_t nSourceSize, mode_t mode) { oslFileHandle SourceFileFH=nullptr; int DestFileFD=0; diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index dce25b5a1990..4d7a7cb43da5 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -266,7 +266,7 @@ oslFileError SAL_CALL osl_getFileStatus(oslDirectoryItem Item, oslFileStatus* pS return osl_File_E_None; } -static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes ) +static oslFileError osl_psz_setFileAttributes( const char* pszFilePath, sal_uInt64 uAttributes ) { oslFileError osl_error = osl_File_E_None; mode_t nNewMode = 0; @@ -327,7 +327,7 @@ oslFileError SAL_CALL osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt6 } static oslFileError osl_psz_setFileTime ( - const sal_Char* pszFilePath, + const char* pszFilePath, const TimeValue* pLastAccessTime, const TimeValue* pLastWriteTime ) { diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 33fcd2952802..207bb907feaf 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -127,7 +127,7 @@ namespace { } sal_Size convert( - sal_Unicode const * pSrcBuf, sal_Size nSrcChars, sal_Char * pDstBuf, sal_Size nDstBytes, + sal_Unicode const * pSrcBuf, sal_Size nSrcChars, char * pDstBuf, sal_Size nDstBytes, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtChars) { OSL_ASSERT(m_converter != nullptr); @@ -885,7 +885,7 @@ namespace } sal_Size convert( - sal_Char const * pSrcBuf, sal_Size nSrcBytes, sal_Unicode * pDstBuf, sal_Size nDstChars, + char const * pSrcBuf, sal_Size nSrcBytes, sal_Unicode * pDstBuf, sal_Size nDstChars, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes) { OSL_ASSERT(m_converter != nullptr); diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index 3c51a909359e..5e661bd656c3 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -86,7 +86,7 @@ * *****************************************************************************/ -static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask); +static oslFileError osl_psz_getVolumeInformation(const char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask); /****************************************************************************/ /* osl_getVolumeInformation */ @@ -194,7 +194,7 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI #endif /* HAVE_STATFS_H */ static oslFileError osl_psz_getVolumeInformation ( - const sal_Char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask) + const char* pszDirectory, oslVolumeInfo* pInfo, sal_uInt32 uFieldMask) { if (!pInfo) return osl_File_E_INVAL; diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index a10fa851a9fc..7befa66678f6 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -139,7 +139,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo /* osl_loadModuleAscii */ /*****************************************************************************/ -oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nRtldMode) +oslModule SAL_CALL osl_loadModuleAscii(const char *pModuleName, sal_Int32 nRtldMode) { SAL_WARN_IF( ((nRtldMode & SAL_LOADMODULE_LAZY) != 0 @@ -277,7 +277,7 @@ osl_getSymbol(oslModule Module, rtl_uString* pSymbolName) /* osl_getAsciiFunctionSymbol */ /*****************************************************************************/ oslGenericFunction SAL_CALL -osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol) +osl_getAsciiFunctionSymbol(oslModule Module, const char *pSymbol) { return reinterpret_cast<oslGenericFunction>(getSymbol(Module, pSymbol)); // requires conditionally-supported conversion from void * to function diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index c56c7a3c3d17..d601b6531531 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -38,7 +38,7 @@ #define PIPEDEFAULTPATH "/tmp" #define PIPEALTERNATEPATH "/var/tmp" -static oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, oslSecurity Security); +static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Options, oslSecurity Security); static struct { @@ -114,7 +114,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *ustrPipeName, oslPipeOptions Option rtl_uString_getLength(ustrPipeName), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS); - sal_Char* pszPipeName = rtl_string_getStr(strPipeName); + char* pszPipeName = rtl_string_getStr(strPipeName); pPipe = osl_psz_createPipe(pszPipeName, Options, Security); if (strPipeName) @@ -137,7 +137,7 @@ getBootstrapSocketPath() return ""; } -static oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Options, +static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Options, oslSecurity Security) { int Flags; @@ -159,7 +159,7 @@ static oslPipe osl_psz_createPipe(const sal_Char *pszPipeName, oslPipeOptions Op if (Security) { - sal_Char Ident[256]; + char Ident[256]; Ident[0] = '\0'; @@ -489,7 +489,7 @@ sal_Int32 SAL_CALL osl_writePipe(oslPipe pPipe, const void *pBuffer, sal_Int32 n BytesToSend -= RetVal; BytesSend += RetVal; - pBuffer= static_cast< sal_Char const* >(pBuffer) + RetVal; + pBuffer= static_cast< char const* >(pBuffer) + RetVal; } return BytesSend; @@ -513,7 +513,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) BytesToRead -= RetVal; BytesRead += RetVal; - pBuffer= static_cast< sal_Char* >(pBuffer) + RetVal; + pBuffer= static_cast< char* >(pBuffer) + RetVal; } return BytesRead; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index d479e0d40cfc..f2746bda2b18 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -79,12 +79,12 @@ struct oslProcessImpl { struct ProcessData { - const sal_Char* m_pszArgs[MAX_ARGS + 1]; - const sal_Char* m_pszDir; - sal_Char* m_pszEnv[MAX_ENVS + 1]; + const char* m_pszArgs[MAX_ARGS + 1]; + const char* m_pszDir; + char* m_pszEnv[MAX_ENVS + 1]; uid_t m_uid; gid_t m_gid; - sal_Char* m_name; + char* m_name; oslCondition m_started; oslProcessImpl* m_pProcImpl; oslFileHandle *m_pInputWrite; @@ -97,12 +97,12 @@ static oslMutex ChildListMutex; } //Anonymous namespace -static oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, - sal_Char *pszArguments[], +static oslProcessError osl_psz_executeProcess(char *pszImageName, + char *pszArguments[], oslProcessOption Options, oslSecurity Security, - sal_Char *pszDirectory, - sal_Char *pszEnvironments[], + char *pszDirectory, + char *pszEnvironments[], oslProcess *pProcess, oslFileHandle *pInputWrite, oslFileHandle *pOutputRead, @@ -426,9 +426,9 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( } oslProcessError Error; - sal_Char* pszWorkDir=nullptr; - sal_Char** pArguments=nullptr; - sal_Char** pEnvironment=nullptr; + char* pszWorkDir=nullptr; + char** pArguments=nullptr; + char** pEnvironment=nullptr; unsigned int idx; char szImagePath[PATH_MAX] = ""; @@ -460,7 +460,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( if ( pArguments == nullptr && nArguments > 0 ) { - pArguments = static_cast<sal_Char**>(malloc( ( nArguments + 2 ) * sizeof(sal_Char*) )); + pArguments = static_cast<char**>(malloc( ( nArguments + 2 ) * sizeof(char*) )); } for ( idx = 0 ; idx < nArguments ; ++idx ) @@ -484,7 +484,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( if ( pEnvironment == nullptr ) { - pEnvironment = static_cast<sal_Char**>(malloc( ( nEnvironmentVars + 2 ) * sizeof(sal_Char*) )); + pEnvironment = static_cast<char**>(malloc( ( nEnvironmentVars + 2 ) * sizeof(char*) )); } rtl_uString2String( &strEnv, @@ -565,12 +565,12 @@ oslProcessError SAL_CALL osl_executeProcess( ); } -oslProcessError osl_psz_executeProcess(sal_Char *pszImageName, - sal_Char *pszArguments[], +oslProcessError osl_psz_executeProcess(char *pszImageName, + char *pszArguments[], oslProcessOption Options, oslSecurity Security, - sal_Char *pszDirectory, - sal_Char *pszEnvironments[], + char *pszDirectory, + char *pszEnvironments[], oslProcess *pProcess, oslFileHandle *pInputWrite, oslFileHandle *pOutputRead, @@ -1009,7 +1009,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F #if defined(__sun) int fd; - sal_Char name[PATH_MAX + 1]; + char name[PATH_MAX + 1]; snprintf(name, sizeof(name), "/proc/%ld", (long)pid); diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 717316c0817c..b7bc5771fd64 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -61,9 +61,9 @@ enum osl_TLockMode struct osl_TFile { int m_Handle; - sal_Char* m_pReadPtr; - sal_Char m_ReadBuf[512]; - sal_Char* m_pWriteBuf; + char* m_pReadPtr; + char m_ReadBuf[512]; + char* m_pWriteBuf; sal_uInt32 m_nWriteBufLen; sal_uInt32 m_nWriteBufFree; }; @@ -91,12 +91,12 @@ struct osl_TProfileImpl sal_uInt32 m_Flags; osl_TFile* m_pFile; osl_TStamp m_Stamp; - sal_Char m_FileName[PATH_MAX + 1]; + char m_FileName[PATH_MAX + 1]; sal_uInt32 m_NoLines; sal_uInt32 m_MaxLines; sal_uInt32 m_NoSections; sal_uInt32 m_MaxSections; - sal_Char** m_Lines; + char** m_Lines; osl_TProfileSection* m_Sections; pthread_mutex_t m_AccessLock; bool m_bIsValid; @@ -104,28 +104,28 @@ struct osl_TProfileImpl } -static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags); +static osl_TFile* openFileImpl(const char* pszFilename, oslProfileOption ProfileFlags); static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags); static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode); static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate); static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile); -static sal_Char* OslProfile_getLine(osl_TFile* pFile); -static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine); -static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen); -static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line); -static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo); +static char* OslProfile_getLine(osl_TFile* pFile); +static bool OslProfile_putLine(osl_TFile* pFile, const char *pszLine); +static char* stripBlanks(char* String, sal_uInt32* pLen); +static char* addLine(osl_TProfileImpl* pProfile, const char* Line); +static char* insertLine(osl_TProfileImpl* pProfile, const char* Line, sal_uInt32 LineNo); static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo); static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, sal_uInt32 NoEntry, sal_uInt32 Line, - sal_Char* Entry, sal_uInt32 Len); + char* Entry, sal_uInt32 Len); static bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection, - int Line, sal_Char* Entry, sal_uInt32 Len); + int Line, char* Entry, sal_uInt32 Len); static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry); -static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len); +static bool addSection(osl_TProfileImpl* pProfile, int Line, const char* Section, sal_uInt32 Len); static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection); -static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section, - const sal_Char* Entry, sal_uInt32 *pNoEntry); +static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const char* Section, + const char* Entry, sal_uInt32 *pNoEntry); static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile); static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup); static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable); @@ -134,8 +134,8 @@ static bool releaseProfile(osl_TProfileImpl* pProfile); static bool writeProfileImpl (osl_TFile* pFile); static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*); static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*); -static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen); -static oslProfile osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags); +static void osl_ProfileGenerateExtension(const char* pszFileName, const char* pszExtension, char* pszTmpName, int BufferMaxLen); +static oslProfile osl_psz_openProfile(const char *pszProfileName, oslProfileOption Flags); oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOption Options) { @@ -149,7 +149,7 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOpti : nullptr; } -static oslProfile osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags) +static oslProfile osl_psz_openProfile(const char *pszProfileName, oslProfileOption Flags) { osl_TFile* pFile; osl_TProfileImpl* pProfile; @@ -352,14 +352,14 @@ static bool writeProfileImpl(osl_TFile* pFile) } sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, - const sal_Char* pszSection, - const sal_Char* pszEntry, - sal_Char* pszString, + const char* pszSection, + const char* pszEntry, + char* pszString, sal_uInt32 MaxLen, - const sal_Char* pszDefault) + const char* pszDefault) { sal_uInt32 NoEntry; - sal_Char* pStr=nullptr; + char* pStr=nullptr; osl_TProfileImpl* pProfile=nullptr; osl_TProfileImpl* pTmpProfile=nullptr; bool bRet = false; @@ -401,7 +401,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, } else { - pStr=const_cast<sal_Char*>(pszDefault); + pStr=const_cast<char*>(pszDefault); } if ( pStr != nullptr ) @@ -432,11 +432,11 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, } sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, - const sal_Char* pszSection, - const sal_Char* pszEntry, + const char* pszSection, + const char* pszEntry, sal_Bool Default) { - sal_Char Line[32]; + char Line[32]; Line[0] = '\0'; if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) @@ -456,14 +456,14 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, } sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, - const sal_Char* pszSection, - const sal_Char* pszEntry, + const char* pszSection, + const char* pszEntry, sal_uInt32 FirstId, - const sal_Char* Strings[], + const char* Strings[], sal_uInt32 Default) { sal_uInt32 i; - sal_Char Line[256]; + char Line[256]; Line[0] = '\0'; if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) @@ -484,15 +484,15 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, } sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, - const sal_Char* pszSection, - const sal_Char* pszEntry, - const sal_Char* pszString) + const char* pszSection, + const char* pszEntry, + const char* pszString) { sal_uInt32 i; bool bRet = false; sal_uInt32 NoEntry; - sal_Char* pStr; - sal_Char* Line = nullptr; + char* pStr; + char* Line = nullptr; osl_TProfileSection* pSec; osl_TProfileImpl* pProfile = nullptr; osl_TProfileImpl* pTmpProfile = static_cast<osl_TProfileImpl*>(Profile); @@ -521,7 +521,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, return false; } - Line = static_cast<sal_Char*>(malloc(strlen(pszEntry)+strlen(pszString)+48)); + Line = static_cast<char*>(malloc(strlen(pszEntry)+strlen(pszString)+48)); if (! (pProfile->m_Flags & osl_Profile_SYSTEM)) { @@ -604,8 +604,8 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, } sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile, - const sal_Char* pszSection, - const sal_Char* pszEntry, + const char* pszSection, + const char* pszEntry, sal_Bool Value) { bool bRet = false; @@ -619,10 +619,10 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile, } sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, - const sal_Char* pszSection, - const sal_Char* pszEntry, + const char* pszSection, + const char* pszEntry, sal_uInt32 FirstId, - const sal_Char* Strings[], + const char* Strings[], sal_uInt32 Value) { int i, n = 0; @@ -640,8 +640,8 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, } sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, - const sal_Char *pszSection, - const sal_Char *pszEntry) + const char *pszSection, + const char *pszEntry) { sal_uInt32 NoEntry; osl_TProfileImpl* pProfile = nullptr; @@ -707,8 +707,8 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, } sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, - const sal_Char *pszSection, - sal_Char* pszBuffer, + const char *pszSection, + char* pszBuffer, sal_uInt32 MaxLen) { sal_uInt32 i, n = 0; @@ -792,7 +792,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, } sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, - sal_Char* pszBuffer, + char* pszBuffer, sal_uInt32 MaxLen) { sal_uInt32 i, n = 0; @@ -926,7 +926,7 @@ static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) return true; } -static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags ) +static osl_TFile* openFileImpl(const char* pszFilename, oslProfileOption ProfileFlags ) { int Flags; osl_TFile* pFile = static_cast<osl_TFile*>(calloc(1, sizeof(osl_TFile))); @@ -1041,12 +1041,12 @@ static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate) return bRet; } -static sal_Char* OslProfile_getLine(osl_TFile* pFile) +static char* OslProfile_getLine(osl_TFile* pFile) { int Max, Free, nLineBytes = 0; - sal_Char* pChr; - sal_Char* pLine = nullptr; - sal_Char* pNewLine; + char* pChr; + char* pLine = nullptr; + char* pNewLine; if ( pFile == nullptr ) { @@ -1093,7 +1093,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile) pChr++); Max = pChr - pFile->m_pReadPtr; - pNewLine = static_cast<sal_Char*>(malloc( nLineBytes + Max + 1 )); + pNewLine = static_cast<char*>(malloc( nLineBytes + Max + 1 )); if( pLine ) { memcpy( pNewLine, pLine, nLineBytes ); @@ -1129,7 +1129,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile) return pLine; } -static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) +static bool OslProfile_putLine(osl_TFile* pFile, const char *pszLine) { unsigned int Len = strlen(pszLine); @@ -1140,7 +1140,7 @@ static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) if ( pFile->m_pWriteBuf == nullptr ) { - pFile->m_pWriteBuf = static_cast<sal_Char*>(malloc(Len+3)); + pFile->m_pWriteBuf = static_cast<char*>(malloc(Len+3)); pFile->m_nWriteBufLen = Len+3; pFile->m_nWriteBufFree = Len+3; } @@ -1148,9 +1148,9 @@ static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) { if ( pFile->m_nWriteBufFree <= Len + 3 ) { - sal_Char* pTmp; + char* pTmp; - pTmp=static_cast<sal_Char*>(realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) )); + pTmp=static_cast<char*>(realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) )); if ( pTmp == nullptr ) { return false; @@ -1171,7 +1171,7 @@ static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine) return true; } -static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen) +static char* stripBlanks(char* String, sal_uInt32* pLen) { if ( ( pLen != nullptr ) && ( *pLen != 0 ) ) { @@ -1191,14 +1191,14 @@ static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen) return String; } -static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) +static char* addLine(osl_TProfileImpl* pProfile, const char* Line) { if (pProfile->m_NoLines >= pProfile->m_MaxLines) { if (pProfile->m_Lines == nullptr) { pProfile->m_MaxLines = LINES_INI; - pProfile->m_Lines = static_cast<sal_Char **>(calloc(pProfile->m_MaxLines, sizeof(sal_Char *))); + pProfile->m_Lines = static_cast<char **>(calloc(pProfile->m_MaxLines, sizeof(char *))); } else { @@ -1206,8 +1206,8 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) unsigned int oldmax=pProfile->m_MaxLines; pProfile->m_MaxLines += LINES_ADD; - pProfile->m_Lines = static_cast<sal_Char **>(realloc(pProfile->m_Lines, - pProfile->m_MaxLines * sizeof(sal_Char *))); + pProfile->m_Lines = static_cast<char **>(realloc(pProfile->m_Lines, + pProfile->m_MaxLines * sizeof(char *))); for ( idx = oldmax ; idx < pProfile->m_MaxLines ; ++idx ) { pProfile->m_Lines[idx]=nullptr; @@ -1230,24 +1230,24 @@ static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) return pProfile->m_Lines[pProfile->m_NoLines - 1]; } -static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo) +static char* insertLine(osl_TProfileImpl* pProfile, const char* Line, sal_uInt32 LineNo) { if (pProfile->m_NoLines >= pProfile->m_MaxLines) { if (pProfile->m_Lines == nullptr) { pProfile->m_MaxLines = LINES_INI; - pProfile->m_Lines = static_cast<sal_Char **>(calloc(pProfile->m_MaxLines, sizeof(sal_Char *))); + pProfile->m_Lines = static_cast<char **>(calloc(pProfile->m_MaxLines, sizeof(char *))); } else { pProfile->m_MaxLines += LINES_ADD; - pProfile->m_Lines = static_cast<sal_Char **>(realloc(pProfile->m_Lines, - pProfile->m_MaxLines * sizeof(sal_Char *))); + pProfile->m_Lines = static_cast<char **>(realloc(pProfile->m_Lines, + pProfile->m_MaxLines * sizeof(char *))); memset(&pProfile->m_Lines[pProfile->m_NoLines], 0, - (pProfile->m_MaxLines - pProfile->m_NoLines - 1) * sizeof(sal_Char*)); + (pProfile->m_MaxLines - pProfile->m_NoLines - 1) * sizeof(char*)); } if (pProfile->m_Lines == nullptr) @@ -1265,7 +1265,7 @@ static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sa sal_uInt32 i, n; memmove(&pProfile->m_Lines[LineNo + 1], &pProfile->m_Lines[LineNo], - (pProfile->m_NoLines - LineNo) * sizeof(sal_Char *)); + (pProfile->m_NoLines - LineNo) * sizeof(char *)); /* adjust line references */ for (i = 0; i < pProfile->m_NoSections; i++) @@ -1299,11 +1299,11 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) sal_uInt32 i, n; memmove(&pProfile->m_Lines[LineNo], &pProfile->m_Lines[LineNo + 1], - (pProfile->m_NoLines - LineNo - 1) * sizeof(sal_Char *)); + (pProfile->m_NoLines - LineNo - 1) * sizeof(char *)); memset(&pProfile->m_Lines[pProfile->m_NoLines - 1], 0, - (pProfile->m_MaxLines - pProfile->m_NoLines) * sizeof(sal_Char*)); + (pProfile->m_MaxLines - pProfile->m_NoLines) * sizeof(char*)); /* adjust line references */ for (i = 0; i < pProfile->m_NoSections; i++) @@ -1329,7 +1329,7 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, sal_uInt32 NoEntry, sal_uInt32 Line, - sal_Char* Entry, sal_uInt32 Len) + char* Entry, sal_uInt32 Len) { Entry = stripBlanks(Entry, &Len); pSection->m_Entries[NoEntry].m_Line = Line; @@ -1339,7 +1339,7 @@ static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, static bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection, - int Line, sal_Char* Entry, + int Line, char* Entry, sal_uInt32 Len) { if (pSection != nullptr) @@ -1398,7 +1398,7 @@ static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) } -static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len) +static bool addSection(osl_TProfileImpl* pProfile, int Line, const char* Section, sal_uInt32 Len) { if (pProfile->m_NoSections >= pProfile->m_MaxSections) { @@ -1474,8 +1474,8 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect } static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, - const sal_Char* Section, - const sal_Char* Entry, + const char* Section, + const char* Entry, sal_uInt32 *pNoEntry) { static sal_uInt32 Sect = 0; @@ -1508,7 +1508,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, for (i = 0; i < pSec->m_NoEntries; i++) { - const sal_Char* pStr = &pProfile->m_Lines[pSec->m_Entries[i].m_Line] + const char* pStr = &pProfile->m_Lines[pSec->m_Entries[i].m_Line] [pSec->m_Entries[i].m_Offset]; if ((Len == pSec->m_Entries[i].m_Len) && (strncasecmp(Entry, pStr, pSec->m_Entries[i].m_Len) @@ -1528,10 +1528,10 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) { sal_uInt32 i; - sal_Char* pStr; - sal_Char* pChar; + char* pStr; + char* pChar; - sal_Char* pLine; + char* pLine; if ( !pFile ) { @@ -1550,7 +1550,7 @@ static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) while ( ( pLine=OslProfile_getLine(pFile) ) != nullptr ) { - sal_Char* bWasAdded = addLine( pProfile, pLine ); + char* bWasAdded = addLine( pProfile, pLine ); free( pLine ); SAL_WARN_IF(!bWasAdded, "sal.osl", "addLine( pProfile, pLine ) ==> false"); if ( ! bWasAdded ) @@ -1674,8 +1674,8 @@ static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup) static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) { osl_TFile* pFile=nullptr; - sal_Char const * const pszExtension = "tmp"; - sal_Char pszTmpName[PATH_MAX]; + char const * const pszExtension = "tmp"; + char pszTmpName[PATH_MAX]; oslProfileOption PFlags=0; pszTmpName[0] = '\0'; @@ -1702,8 +1702,8 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) static bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile) { - sal_Char pszBakFile[PATH_MAX]; - sal_Char pszTmpFile[PATH_MAX]; + char pszBakFile[PATH_MAX]; + char pszTmpFile[PATH_MAX]; pszBakFile[0] = '\0'; pszTmpFile[0] = '\0'; @@ -1738,9 +1738,9 @@ static bool osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile) return result; } -static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen) +static void osl_ProfileGenerateExtension(const char* pszFileName, const char* pszExtension, char* pszTmpName, int BufferMaxLen) { - sal_Char* cursor = pszTmpName; + char* cursor = pszTmpName; int len; /* concatenate filename + "." + extension, limited to the size of the diff --git a/sal/osl/unx/secimpl.hxx b/sal/osl/unx/secimpl.hxx index fda1c421c5db..f93b85f8f505 100644 --- a/sal/osl/unx/secimpl.hxx +++ b/sal/osl/unx/secimpl.hxx @@ -27,7 +27,7 @@ struct oslSecurityImpl { char m_buffer[1]; /* should be a C99 flexible array member */ }; -bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax); +bool osl_psz_getUserIdent(oslSecurity Security, char *pszIdent, sal_uInt32 nMax); #endif diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx index 413c67e943d3..23b8046dbcb5 100644 --- a/sal/osl/unx/security.cxx +++ b/sal/osl/unx/security.cxx @@ -193,7 +193,7 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer( sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent) { bool bRet = false; - sal_Char pszIdent[1024]; + char pszIdent[1024]; pszIdent[0] = '\0'; @@ -205,9 +205,9 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent return bRet; } -bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax) +bool osl_psz_getUserIdent(oslSecurity Security, char *pszIdent, sal_uInt32 nMax) { - sal_Char buffer[32]; + char buffer[32]; sal_Int32 nChr; oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); @@ -227,7 +227,7 @@ bool osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 n sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName) { bool bRet = false; - sal_Char * pszName; + char * pszName; sal_Int32 len; oslSecurityImpl *pSecImpl = static_cast<oslSecurityImpl *>(Security); @@ -285,7 +285,7 @@ static bool osl_psz_getHomeDir(oslSecurity Security, OString* pszDirectory) #ifdef HAIKU dev_t volume = dev_for_path("/boot"); - sal_Char homeDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH]; + char homeDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH]; status_t result = find_directory(B_USER_DIRECTORY, volume, false, homeDir, sizeof(homeDir)); if (result == B_OK) { @@ -330,7 +330,7 @@ static bool osl_psz_getHomeDir(oslSecurity Security, OString* pszDirectory) /* if current user, check also environment for HOME */ if (getuid() == pSecImpl->m_pPasswd.pw_uid) { - sal_Char *pStr = nullptr; + char *pStr = nullptr; #ifdef __sun char buffer[8192]; @@ -398,7 +398,7 @@ static bool osl_psz_getConfigDir(oslSecurity Security, OString* pszDirectory) assert(pszDirectory != nullptr); (void) Security; dev_t volume = dev_for_path("/boot"); - sal_Char configDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH]; + char configDir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH]; status_t result = find_directory(B_USER_SETTINGS_DIRECTORY, volume, false, configDir, sizeof(configDir)); if (result == B_OK) { @@ -417,7 +417,7 @@ static bool osl_psz_getConfigDir(oslSecurity Security, OString* pszDirectory) { assert(pszDirectory != nullptr); - sal_Char *pStr = getenv("XDG_CONFIG_HOME"); + char *pStr = getenv("XDG_CONFIG_HOME"); if (pStr == nullptr || pStr[0] == '\0' || access(pStr, 0) != 0) { diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index f708c4911797..5db922e7674d 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -263,25 +263,25 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType) #define ERROR_FROM_NATIVE(y) osl_SocketErrorFromNative(y) static oslSocketAddr osl_psz_createInetSocketAddr ( - const sal_Char* pszDottedAddr, sal_Int32 Port); + const char* pszDottedAddr, sal_Int32 Port); static oslHostAddr osl_psz_createHostAddr ( - const sal_Char *pszHostname, const oslSocketAddr Addr); + const char *pszHostname, const oslSocketAddr Addr); static oslHostAddr osl_psz_createHostAddrByName ( - const sal_Char *pszHostname); + const char *pszHostname); -static const sal_Char* osl_psz_getHostnameOfHostAddr ( +static const char* osl_psz_getHostnameOfHostAddr ( const oslHostAddr Addr); static oslSocketAddr osl_psz_resolveHostname ( - const sal_Char* pszHostname); + const char* pszHostname); static sal_Int32 osl_psz_getServicePort ( - const sal_Char* pszServicename, const sal_Char* pszProtocol); + const char* pszServicename, const char* pszProtocol); static void osl_psz_getLastSocketErrorDescription ( - oslSocket Socket, sal_Char* pBuffer, sal_uInt32 BufferSize); + oslSocket Socket, char* pBuffer, sal_uInt32 BufferSize); static oslSocket createSocketImpl(int Socket) { @@ -478,7 +478,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( { rtl_String* strDottedAddr=nullptr; oslSocketAddr Addr; - sal_Char* pszDottedAddr=nullptr; + char* pszDottedAddr=nullptr; if ( ustrDottedAddr != nullptr ) { @@ -501,7 +501,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr ( } oslSocketAddr osl_psz_createInetSocketAddr ( - const sal_Char* pszDottedAddr, + const char* pszDottedAddr, sal_Int32 Port) { oslSocketAddr pAddr = nullptr; @@ -590,7 +590,7 @@ struct oslAddrInfo }; } -static bool isFullQualifiedDomainName (const sal_Char *pHostName) +static bool isFullQualifiedDomainName (const char *pHostName) { /* a FQDN (aka 'hostname.domain.top_level_domain' ) * is a name which contains a dot '.' in it ( would @@ -599,9 +599,9 @@ static bool isFullQualifiedDomainName (const sal_Char *pHostName) return strchr( pHostName, int('.') ) != nullptr; } -static sal_Char* getFullQualifiedDomainName (const sal_Char *pHostName) +static char* getFullQualifiedDomainName (const char *pHostName) { - sal_Char *pFullQualifiedName = nullptr; + char *pFullQualifiedName = nullptr; if (isFullQualifiedDomainName(pHostName)) { @@ -619,7 +619,7 @@ static sal_Char* getFullQualifiedDomainName (const sal_Char *pHostName) struct oslHostAddrImpl { - sal_Char *pHostName; + char *pHostName; oslSocketAddr pSockAddr; }; @@ -628,7 +628,7 @@ static oslHostAddr addrinfoToHostAddr (const addrinfo* ai) if (!ai || !ai->ai_canonname || !ai->ai_addr) return nullptr; - sal_Char* cn = getFullQualifiedDomainName(ai->ai_canonname); + char* cn = getFullQualifiedDomainName(ai->ai_canonname); SAL_WARN_IF( !cn, "sal.osl", "couldn't get full qualified domain name" ); if (cn == nullptr) return nullptr; @@ -681,7 +681,7 @@ oslHostAddr SAL_CALL osl_createHostAddr ( { oslHostAddr HostAddr; rtl_String* strHostname=nullptr; - sal_Char* pszHostName=nullptr; + char* pszHostName=nullptr; if ( ustrHostname != nullptr ) { @@ -704,11 +704,11 @@ oslHostAddr SAL_CALL osl_createHostAddr ( } oslHostAddr osl_psz_createHostAddr ( - const sal_Char *pszHostname, + const char *pszHostname, const oslSocketAddr pAddr) { oslHostAddr pHostAddr; - sal_Char *cn; + char *cn; SAL_WARN_IF( !pszHostname, "sal.osl", "undefined hostname" ); SAL_WARN_IF( !pAddr, "sal.osl", "undefined address" ); @@ -738,7 +738,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname) { oslHostAddr HostAddr; rtl_String* strHostname=nullptr; - sal_Char* pszHostName=nullptr; + char* pszHostName=nullptr; if ( ustrHostname != nullptr ) { @@ -760,7 +760,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString *ustrHostname) return HostAddr; } -oslHostAddr osl_psz_createHostAddrByName (const sal_Char *pszHostname) +oslHostAddr osl_psz_createHostAddrByName (const char *pszHostname) { oslAddrInfo aAddrInfo(pszHostname, /* isInet */ true); @@ -786,7 +786,7 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr (const oslSocketAddr pAddr) if (res != 0) return nullptr; - sal_Char *cn = getFullQualifiedDomainName(host); + char *cn = getFullQualifiedDomainName(host); SAL_WARN_IF( !cn, "sal.osl", "couldn't get full qualified domain name" ); if (cn == nullptr) return nullptr; @@ -832,12 +832,12 @@ void SAL_CALL osl_getHostnameOfHostAddr ( const oslHostAddr Addr, rtl_uString **ustrHostname) { - const sal_Char* pHostname = osl_psz_getHostnameOfHostAddr(Addr); + const char* pHostname = osl_psz_getHostnameOfHostAddr(Addr); rtl_uString_newFromAscii (ustrHostname, pHostname); } -const sal_Char* osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) +const char* osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) { if (pAddr) return pAddr->pHostName; @@ -868,7 +868,7 @@ void SAL_CALL osl_destroyHostAddr (oslHostAddr pAddr) oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname) { static auto const init = []() -> std::pair<oslSocketResult, OUString> { - sal_Char LocalHostname[256] = ""; + char LocalHostname[256] = ""; #ifdef SYSV struct utsname uts; @@ -894,7 +894,7 @@ oslSocketResult SAL_CALL osl_getLocalHostname(rtl_uString **ustrLocalHostname) /* no, determine it via dns */ Addr = osl_psz_createHostAddrByName(LocalHostname); - const sal_Char *pStr; + const char *pStr; if ((pStr = osl_psz_getHostnameOfHostAddr(Addr)) != nullptr) { strncpy(LocalHostname, pStr, sizeof( LocalHostname )); @@ -920,7 +920,7 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname) { oslSocketAddr Addr; rtl_String* strHostname=nullptr; - sal_Char* pszHostName=nullptr; + char* pszHostName=nullptr; if ( ustrHostname != nullptr ) { @@ -942,7 +942,7 @@ oslSocketAddr SAL_CALL osl_resolveHostname(rtl_uString *ustrHostname) return Addr; } -oslSocketAddr osl_psz_resolveHostname(const sal_Char* pszHostname) +oslSocketAddr osl_psz_resolveHostname(const char* pszHostname) { struct oslHostAddrImpl *pAddr = osl_psz_createHostAddrByName(pszHostname); @@ -963,8 +963,8 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString sal_Int32 nPort; rtl_String* strServicename=nullptr; rtl_String* strProtocol=nullptr; - sal_Char* pszServiceName=nullptr; - sal_Char* pszProtocol=nullptr; + char* pszServiceName=nullptr; + char* pszProtocol=nullptr; if ( ustrServicename != nullptr ) { @@ -1001,8 +1001,8 @@ sal_Int32 SAL_CALL osl_getServicePort(rtl_uString *ustrServicename, rtl_uString return nPort; } -sal_Int32 osl_psz_getServicePort(const sal_Char* pszServicename, - const sal_Char* pszProtocol) +sal_Int32 osl_psz_getServicePort(const char* pszServicename, + const char* pszProtocol) { struct servent* ps; @@ -2075,7 +2075,7 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket pSocket) void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **ustrError) { - sal_Char pszError[1024]; + char pszError[1024]; pszError[0] = '\0'; @@ -2084,7 +2084,7 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString ** rtl_uString_newFromAscii(ustrError,pszError); } -void osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) +void osl_psz_getLastSocketErrorDescription(oslSocket pSocket, char* pBuffer, sal_uInt32 BufferSize) { /* make sure pBuffer will be a zero-terminated string even when strncpy has to cut */ pBuffer[BufferSize-1]= '\0'; diff --git a/sal/osl/unx/sockimpl.hxx b/sal/osl/unx/sockimpl.hxx index 940c223fe778..1a9bc1f9ede2 100644 --- a/sal/osl/unx/sockimpl.hxx +++ b/sal/osl/unx/sockimpl.hxx @@ -47,7 +47,7 @@ struct oslSocketAddrImpl struct oslPipeImpl { int m_Socket; - sal_Char m_Name[sizeof sockaddr_un::sun_path]; + char m_Name[sizeof sockaddr_un::sun_path]; oslInterlockedCount m_nRefCount; bool m_bClosed; #if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT) diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx index aecfab6d85a0..e8901784c878 100644 --- a/sal/osl/unx/uunxapi.cxx +++ b/sal/osl/unx/uunxapi.cxx @@ -145,7 +145,7 @@ typedef void accessFilePathState; */ static OString macxp_resolveAliasAndConvert(OString const & p) { - sal_Char path[PATH_MAX]; + char path[PATH_MAX]; if (p.getLength() < PATH_MAX) { strcpy(path, p.getStr()); @@ -240,7 +240,7 @@ template<typename T> bool realpath_(const T& pstrFileName, T& ppstrResolvedName) if (bRet) { - ppstrResolvedName = fromOString<T>(OString(static_cast<sal_Char*>(rp))); + ppstrResolvedName = fromOString<T>(OString(rp)); } errno = saved_errno; diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index a5aba24248c4..a0cb52257b96 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -524,17 +524,17 @@ DWORD GetCaseCorrectPathName( static bool osl_decodeURL_( rtl_String* strUTF8, rtl_uString** pstrDecodedURL ) { - sal_Char *pBuffer; - const sal_Char *pSrcEnd; - const sal_Char *pSrc; - sal_Char *pDest; + char *pBuffer; + const char *pSrcEnd; + const char *pSrc; + char *pDest; sal_Int32 nSrcLen; bool bValidEncoded = true; /* Assume success */ /* The resulting decoded string length is shorter or equal to the source length */ nSrcLen = rtl_string_getLength(strUTF8); - pBuffer = static_cast<sal_Char*>(malloc((nSrcLen + 1) * sizeof(sal_Char))); + pBuffer = static_cast<char*>(malloc((nSrcLen + 1) * sizeof(char))); pDest = pBuffer; pSrc = rtl_string_getStr(strUTF8); @@ -547,15 +547,15 @@ static bool osl_decodeURL_( rtl_String* strUTF8, rtl_uString** pstrDecodedURL ) { case '%': { - sal_Char aToken[3]; - sal_Char aChar; + char aToken[3]; + char aChar; pSrc++; aToken[0] = *pSrc++; aToken[1] = *pSrc++; aToken[2] = 0; - aChar = static_cast<sal_Char>(strtoul( aToken, nullptr, 16 )); + aChar = static_cast<char>(strtoul( aToken, nullptr, 16 )); /* The chars are path delimiters and must not be encoded */ @@ -594,15 +594,15 @@ static void osl_encodeURL_( rtl_uString *strURL, rtl_String **pstrEncodedURL ) /* Encode non ascii characters within the URL */ rtl_String *strUTF8 = nullptr; - sal_Char *pszEncodedURL; - const sal_Char *pURLScan; - sal_Char *pURLDest; + char *pszEncodedURL; + const char *pURLScan; + char *pURLDest; sal_Int32 nURLScanLen; sal_Int32 nURLScanCount; rtl_uString2String( &strUTF8, rtl_uString_getStr( strURL ), rtl_uString_getLength( strURL ), RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS ); - pszEncodedURL = static_cast<sal_Char*>(malloc( (rtl_string_getLength( strUTF8 ) * 3 + 1) * sizeof(sal_Char) )); + pszEncodedURL = static_cast<char*>(malloc( (rtl_string_getLength( strUTF8 ) * 3 + 1) * sizeof(char) )); assert(pszEncodedURL); // Don't handle OOM conditions pURLDest = pszEncodedURL; pURLScan = rtl_string_getStr( strUTF8 ); @@ -611,7 +611,7 @@ static void osl_encodeURL_( rtl_uString *strURL, rtl_String **pstrEncodedURL ) while ( nURLScanCount < nURLScanLen ) { - sal_Char cCurrent = *pURLScan; + char cCurrent = *pURLScan; switch ( cCurrent ) { default: diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index ece63feb9bc9..67eeb2df0f6d 100644 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -86,7 +86,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldM return ret; } -oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 ) +oslModule SAL_CALL osl_loadModuleAscii(const char *pModuleName, sal_Int32 ) { HMODULE h; UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); @@ -170,7 +170,7 @@ oslGenericFunction SAL_CALL osl_getFunctionSymbol( oslModule Module, rtl_uString } oslGenericFunction SAL_CALL -osl_getAsciiFunctionSymbol( oslModule Module, const sal_Char *pSymbol ) +osl_getAsciiFunctionSymbol( oslModule Module, const char *pSymbol ) { oslGenericFunction fncAddr = nullptr; diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index 294245a65525..9538254659dd 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -64,14 +64,14 @@ void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath) } // is [A-Za-z]:[/|\]\0 -const sal_Char* const LDP = ":"; -const sal_Char* const LDP_WITH_BACKSLASH = ":\\"; -const sal_Char* const LDP_WITH_SLASH = ":/"; +const char* const LDP = ":"; +const char* const LDP_WITH_BACKSLASH = ":\\"; +const char* const LDP_WITH_SLASH = ":/"; // degenerated case returned by the Windows FileOpen dialog // when someone enters for instance "x:filename", the Win32 // API accepts this case -const sal_Char* const LDP_WITH_DOT_BACKSLASH = ":.\\"; +const char* const LDP_WITH_DOT_BACKSLASH = ":.\\"; bool osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath) { diff --git a/sal/osl/w32/pipe.cxx b/sal/osl/w32/pipe.cxx index e5f33ff7c191..06a6bf82d98d 100644 --- a/sal/osl/w32/pipe.cxx +++ b/sal/osl/w32/pipe.cxx @@ -440,7 +440,7 @@ sal_Int32 SAL_CALL osl_writePipe(oslPipe pPipe, const void *pBuffer , sal_Int32 BytesToSend -= RetVal; BytesSend += RetVal; - pBuffer= static_cast< sal_Char const* >(pBuffer) + RetVal; + pBuffer= static_cast< char const* >(pBuffer) + RetVal; } return BytesSend; @@ -464,7 +464,7 @@ sal_Int32 SAL_CALL osl_readPipe(oslPipe pPipe, void *pBuffer, sal_Int32 n) BytesToRead -= RetVal; BytesRead += RetVal; - pBuffer= static_cast< sal_Char* >(pBuffer) + RetVal; + pBuffer= static_cast< char* >(pBuffer) + RetVal; } return BytesRead; } diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index e095da62ccad..17540f65e424 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -84,9 +84,9 @@ enum osl_TLockMode struct osl_TFile { HANDLE m_Handle; - sal_Char* m_pReadPtr; - sal_Char m_ReadBuf[512]; - sal_Char* m_pWriteBuf; + char* m_pReadPtr; + char m_ReadBuf[512]; + char* m_pWriteBuf; sal_uInt32 m_nWriteBufLen; sal_uInt32 m_nWriteBufFree; }; @@ -120,7 +120,7 @@ struct osl_TProfileImpl sal_uInt32 m_MaxLines; sal_uInt32 m_NoSections; sal_uInt32 m_MaxSections; - sal_Char** m_Lines; + char** m_Lines; rtl_uString *m_strFileName; osl_TProfileSection* m_Sections; }; @@ -133,22 +133,22 @@ static bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode static bool rewindFile(osl_TFile* pFile, bool bTruncate); static osl_TStamp getFileStamp(osl_TFile* pFile); -static bool getLine(osl_TFile* pFile, sal_Char *pszLine, int MaxLen); -static bool putLine(osl_TFile* pFile, const sal_Char *pszLine); -static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen); -static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line); -static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo); +static bool getLine(osl_TFile* pFile, char *pszLine, int MaxLen); +static bool putLine(osl_TFile* pFile, const char *pszLine); +static const char* stripBlanks(const char* String, sal_uInt32* pLen); +static const char* addLine(osl_TProfileImpl* pProfile, const char* Line); +static const char* insertLine(osl_TProfileImpl* pProfile, const char* Line, sal_uInt32 LineNo); static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo); static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, sal_uInt32 NoEntry, sal_uInt32 Line, - const sal_Char* Entry, sal_uInt32 Len); + const char* Entry, sal_uInt32 Len); static bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection, - int Line, const sal_Char* Entry, sal_uInt32 Len); + int Line, const char* Entry, sal_uInt32 Len); static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry); -static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len); +static bool addSection(osl_TProfileImpl* pProfile, int Line, const char* Section, sal_uInt32 Len); static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection); -static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section, - const sal_Char* Entry, sal_uInt32 *pNoEntry); +static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const char* Section, + const char* Entry, sal_uInt32 *pNoEntry); static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile); static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup); static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable); @@ -367,9 +367,9 @@ static bool writeProfileImpl(osl_TFile* pFile) namespace { // Use Unicode version of GetPrivateProfileString, to work with Multi-language paths DWORD GetPrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, - const sal_Char* pszSection, const sal_Char* pszEntry, - sal_Char* pszString, sal_uInt32 MaxLen, - const sal_Char* pszDefault) + const char* pszSection, const char* pszEntry, + char* pszString, sal_uInt32 MaxLen, + const char* pszDefault) { OSL_ASSERT(pProfile && (!MaxLen || pszString)); @@ -409,8 +409,8 @@ DWORD GetPrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, // Use Unicode version of WritePrivateProfileString, to work with Multi-language paths bool WritePrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, - const sal_Char* pszSection, const sal_Char* pszEntry, - const sal_Char* pszString) + const char* pszSection, const char* pszEntry, + const char* pszString) { OSL_ASSERT(pProfile && pszSection); rtl_uString *pSection, *pEntry = nullptr, *pString = nullptr; @@ -444,12 +444,12 @@ bool WritePrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, } sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, - const sal_Char* pszSection, const sal_Char* pszEntry, - sal_Char* pszString, sal_uInt32 MaxLen, - const sal_Char* pszDefault) + const char* pszSection, const char* pszEntry, + char* pszString, sal_uInt32 MaxLen, + const char* pszDefault) { sal_uInt32 NoEntry; - const sal_Char* pStr = nullptr; + const char* pStr = nullptr; osl_TProfileImpl* pProfile = nullptr; pProfile = acquireProfile(Profile, false); @@ -496,10 +496,10 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, } sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, - const sal_Char* pszSection, const sal_Char* pszEntry, + const char* pszSection, const char* pszEntry, sal_Bool Default) { - sal_Char Line[32]; + char Line[32]; if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) { @@ -518,12 +518,12 @@ sal_Bool SAL_CALL osl_readProfileBool(oslProfile Profile, } sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, - const sal_Char* pszSection, const sal_Char* pszEntry, - sal_uInt32 FirstId, const sal_Char* Strings[], + const char* pszSection, const char* pszEntry, + sal_uInt32 FirstId, const char* Strings[], sal_uInt32 Default) { sal_uInt32 i; - sal_Char Line[256]; + char Line[256]; if (osl_readProfileString(Profile, pszSection, pszEntry, Line, sizeof(Line), "")) { @@ -543,14 +543,14 @@ sal_uInt32 SAL_CALL osl_readProfileIdent(oslProfile Profile, } sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, - const sal_Char* pszSection, const sal_Char* pszEntry, - const sal_Char* pszString) + const char* pszSection, const char* pszEntry, + const char* pszString) { sal_uInt32 i; bool bRet = false; sal_uInt32 NoEntry; - const sal_Char* pStr; - sal_Char Line[4096]; + const char* pStr; + char Line[4096]; osl_TProfileSection* pSec; osl_TProfileImpl* pProfile = nullptr; @@ -625,7 +625,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile, } sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile, - const sal_Char* pszSection, const sal_Char* pszEntry, + const char* pszSection, const char* pszEntry, sal_Bool Value) { bool bRet = false; @@ -639,8 +639,8 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile, } sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, - const sal_Char* pszSection, const sal_Char* pszEntry, - sal_uInt32 FirstId, const sal_Char* Strings[], + const char* pszSection, const char* pszEntry, + sal_uInt32 FirstId, const char* Strings[], sal_uInt32 Value) { int i, n; @@ -657,7 +657,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile, } sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, - const sal_Char *pszSection, const sal_Char *pszEntry) + const char *pszSection, const char *pszEntry) { sal_uInt32 NoEntry; osl_TProfileImpl* pProfile = nullptr; @@ -699,8 +699,8 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile, return bRet; } -sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_Char *pszSection, - sal_Char* pszBuffer, sal_uInt32 MaxLen) +sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const char *pszSection, + char* pszBuffer, sal_uInt32 MaxLen) { sal_uInt32 i, n = 0; sal_uInt32 NoEntry; @@ -976,7 +976,7 @@ bool osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString* return nError == osl_File_E_None; } -sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuffer, sal_uInt32 MaxLen) +sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, char* pszBuffer, sal_uInt32 MaxLen) { sal_uInt32 i, n = 0; osl_TProfileImpl* pProfile = acquireProfile(Profile, false); @@ -1167,12 +1167,12 @@ static bool rewindFile(osl_TFile* pFile, bool bTruncate) return true; } -static bool getLine(osl_TFile* pFile, sal_Char *pszLine, int MaxLen) +static bool getLine(osl_TFile* pFile, char *pszLine, int MaxLen) { DWORD Max; size_t Free; - sal_Char* pChr; - sal_Char* pLine = pszLine; + char* pChr; + char* pLine = pszLine; if (pFile->m_Handle == INVALID_HANDLE_VALUE) return false; @@ -1246,7 +1246,7 @@ static bool getLine(osl_TFile* pFile, sal_Char *pszLine, int MaxLen) return true; } -static bool putLine(osl_TFile* pFile, const sal_Char *pszLine) +static bool putLine(osl_TFile* pFile, const char *pszLine) { unsigned int Len = strlen(pszLine); @@ -1257,7 +1257,7 @@ static bool putLine(osl_TFile* pFile, const sal_Char *pszLine) if ( pFile->m_pWriteBuf == nullptr ) { - pFile->m_pWriteBuf = static_cast<sal_Char*>(malloc(Len+3)); + pFile->m_pWriteBuf = static_cast<char*>(malloc(Len+3)); pFile->m_nWriteBufLen = Len+3; pFile->m_nWriteBufFree = Len+3; } @@ -1265,9 +1265,9 @@ static bool putLine(osl_TFile* pFile, const sal_Char *pszLine) { if ( pFile->m_nWriteBufFree <= Len + 3 ) { - sal_Char* pTmp; + char* pTmp; - pTmp=static_cast<sal_Char*>(realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) )); + pTmp=static_cast<char*>(realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) )); if ( pTmp == nullptr ) { return false; @@ -1292,7 +1292,7 @@ static bool putLine(osl_TFile* pFile, const sal_Char *pszLine) /* platform specific end */ -static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen) +static const char* stripBlanks(const char* String, sal_uInt32* pLen) { if ( (pLen != nullptr) && ( *pLen != 0 ) ) { @@ -1312,14 +1312,14 @@ static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen) return String; } -static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) +static const char* addLine(osl_TProfileImpl* pProfile, const char* Line) { if (pProfile->m_NoLines >= pProfile->m_MaxLines) { if (pProfile->m_Lines == nullptr) { pProfile->m_MaxLines = LINES_INI; - pProfile->m_Lines = static_cast<sal_Char **>(calloc(pProfile->m_MaxLines, sizeof(sal_Char *))); + pProfile->m_Lines = static_cast<char **>(calloc(pProfile->m_MaxLines, sizeof(char *))); } else { @@ -1327,7 +1327,7 @@ static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) unsigned int oldmax=pProfile->m_MaxLines; pProfile->m_MaxLines += LINES_ADD; - if (auto p = static_cast<sal_Char **>(realloc(pProfile->m_Lines, pProfile->m_MaxLines * sizeof(sal_Char *)))) + if (auto p = static_cast<char **>(realloc(pProfile->m_Lines, pProfile->m_MaxLines * sizeof(char *)))) { pProfile->m_Lines = p; @@ -1361,25 +1361,25 @@ static const sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line) return pProfile->m_Lines[pProfile->m_NoLines - 1]; } -static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo) +static const char* insertLine(osl_TProfileImpl* pProfile, const char* Line, sal_uInt32 LineNo) { if (pProfile->m_NoLines >= pProfile->m_MaxLines) { if (pProfile->m_Lines == nullptr) { pProfile->m_MaxLines = LINES_INI; - pProfile->m_Lines = static_cast<sal_Char **>(calloc(pProfile->m_MaxLines, sizeof(sal_Char *))); + pProfile->m_Lines = static_cast<char **>(calloc(pProfile->m_MaxLines, sizeof(char *))); } else { pProfile->m_MaxLines += LINES_ADD; - if (auto p = static_cast<sal_Char**>( - realloc(pProfile->m_Lines, pProfile->m_MaxLines * sizeof(sal_Char*)))) + if (auto p = static_cast<char**>( + realloc(pProfile->m_Lines, pProfile->m_MaxLines * sizeof(char*)))) { pProfile->m_Lines = p; memset(&pProfile->m_Lines[pProfile->m_NoLines], 0, - (pProfile->m_MaxLines - pProfile->m_NoLines - 1) * sizeof(sal_Char*)); + (pProfile->m_MaxLines - pProfile->m_NoLines - 1) * sizeof(char*)); } else { @@ -1403,7 +1403,7 @@ static const sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Li sal_uInt32 i, n; memmove(&pProfile->m_Lines[LineNo + 1], &pProfile->m_Lines[LineNo], - (pProfile->m_NoLines - LineNo) * sizeof(sal_Char *)); + (pProfile->m_NoLines - LineNo) * sizeof(char *)); /* adjust line references */ for (i = 0; i < pProfile->m_NoSections; i++) @@ -1437,11 +1437,11 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) sal_uInt32 i, n; memmove(&pProfile->m_Lines[LineNo], &pProfile->m_Lines[LineNo + 1], - (pProfile->m_NoLines - LineNo - 1) * sizeof(sal_Char *)); + (pProfile->m_NoLines - LineNo - 1) * sizeof(char *)); memset(&pProfile->m_Lines[pProfile->m_NoLines - 1], 0, - (pProfile->m_MaxLines - pProfile->m_NoLines) * sizeof(sal_Char*)); + (pProfile->m_MaxLines - pProfile->m_NoLines) * sizeof(char*)); /* adjust line references */ for (i = 0; i < pProfile->m_NoSections; i++) @@ -1469,7 +1469,7 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, sal_uInt32 NoEntry, sal_uInt32 Line, - const sal_Char* Entry, sal_uInt32 Len) + const char* Entry, sal_uInt32 Len) { Entry = stripBlanks(Entry, &Len); pSection->m_Entries[NoEntry].m_Line = Line; @@ -1480,7 +1480,7 @@ static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, } static bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection, - int Line, const sal_Char* Entry, sal_uInt32 Len) + int Line, const char* Entry, sal_uInt32 Len) { if (pSection != nullptr) { @@ -1545,7 +1545,7 @@ static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) return; } -static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len) +static bool addSection(osl_TProfileImpl* pProfile, int Line, const char* Section, sal_uInt32 Len) { if (pProfile->m_NoSections >= pProfile->m_MaxSections) { @@ -1631,8 +1631,8 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect return; } -static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section, - const sal_Char* Entry, sal_uInt32 *pNoEntry) +static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const char* Section, + const char* Entry, sal_uInt32 *pNoEntry) { static sal_uInt32 Sect = 0; sal_uInt32 i, n; @@ -1666,7 +1666,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char for (i = 0; i < pSec->m_NoEntries; i++) { - const sal_Char* pStr = &pProfile->m_Lines[pSec->m_Entries[i].m_Line] + const char* pStr = &pProfile->m_Lines[pSec->m_Entries[i].m_Line] [pSec->m_Entries[i].m_Offset]; if ((Len == pSec->m_Entries[i].m_Len) && (strnicmp(Entry, pStr, pSec->m_Entries[i].m_Len) @@ -1686,9 +1686,9 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) { sal_uInt32 i; - sal_Char const * pStr; - sal_Char const * pChar; - sal_Char Line[4096]; + char const * pStr; + char const * pChar; + char Line[4096]; pProfile->m_NoLines = 0; pProfile->m_NoSections = 0; @@ -1996,9 +1996,9 @@ static bool releaseProfile(osl_TProfileImpl* pProfile) static bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile, sal_Unicode *strProfile) { - sal_Char *pChr; - sal_Char Buffer[4096] = ""; - sal_Char Product[132] = ""; + char *pChr; + char Buffer[4096] = ""; + char Product[132] = ""; ::osl::LongPathBuffer< sal_Unicode > aPath( MAX_LONG_PATH ); aPath[0] = 0; @@ -2034,7 +2034,7 @@ static bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile rtl_uString * strSVFallback = nullptr; rtl_uString * strSVLocation = nullptr; rtl_uString * strSVName = nullptr; - ::osl::LongPathBuffer< sal_Char > aDir( MAX_LONG_PATH ); + ::osl::LongPathBuffer< char > aDir( MAX_LONG_PATH ); oslProfile hProfile; rtl_uString_newFromAscii(&strSVFallback, SVERSION_FALLBACK); @@ -2183,7 +2183,7 @@ static bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile } { - ::osl::LongPathBuffer< sal_Char > aTmpPath( MAX_LONG_PATH ); + ::osl::LongPathBuffer< char > aTmpPath( MAX_LONG_PATH ); WideCharToMultiByte(CP_ACP,0, o3tl::toW(aPath), -1, aTmpPath, aTmpPath.getBufSizeInSymbols(), nullptr, nullptr); @@ -2192,10 +2192,10 @@ static bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile if (((access(aTmpPath, 0) < 0) && (nPos != -1)) || (*strPath == 0)) { - static const sal_Char *SubDirs[] = SVERSION_DIRS; + static const char *SubDirs[] = SVERSION_DIRS; unsigned i = 0; - sal_Char *pStr = aTmpPath + nPos; + char *pStr = aTmpPath + nPos; for (i = 0; i < SAL_N_ELEMENTS(SubDirs); i++) if (strnicmp(pStr + 1, SubDirs[i], strlen(SubDirs[i])) == 0) @@ -2232,7 +2232,7 @@ static bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile copy_ustr_n(aPath + dwPathLen, strFile, rtl_ustr_getLength(strFile)+1); { - ::osl::LongPathBuffer< sal_Char > aTmpPath( MAX_LONG_PATH ); + ::osl::LongPathBuffer< char > aTmpPath( MAX_LONG_PATH ); WideCharToMultiByte(CP_ACP,0, o3tl::toW(aPath), -1, aTmpPath, aTmpPath.getBufSizeInSymbols(), nullptr, nullptr); @@ -2300,7 +2300,7 @@ static bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *strFile } else { - ::osl::LongPathBuffer< sal_Char > aTmpPath2( MAX_LONG_PATH ); + ::osl::LongPathBuffer< char > aTmpPath2( MAX_LONG_PATH ); int n; if ((n = WideCharToMultiByte( diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index e37910f5fd14..b0173357c187 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -609,7 +609,7 @@ oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname) static auto const init = []() -> std::pair<oslSocketResult, OUString> { sal_Unicode LocalHostname[256] = {0}; - sal_Char Host[256]= ""; + char Host[256]= ""; if (gethostname(Host, sizeof(Host)) == 0) { /* check if we have an FQDN; if not, try to determine it via dns first: */ @@ -1101,7 +1101,7 @@ sal_Int32 SAL_CALL osl_receiveSocket ( return osl_Socket_Error; return recv(pSocket->m_Socket, - static_cast<sal_Char*>(pBuffer), + static_cast<char*>(pBuffer), BytesToRead, MSG_FLAG_TO_NATIVE(Flag)); } @@ -1125,7 +1125,7 @@ sal_Int32 SAL_CALL osl_receiveFromSocket ( return osl_Socket_Error; return recvfrom(pSocket->m_Socket, - static_cast<sal_Char*>(pBuffer), + static_cast<char*>(pBuffer), BufferSize, MSG_FLAG_TO_NATIVE(Flag), pSystemSockAddr, @@ -1142,7 +1142,7 @@ sal_Int32 SAL_CALL osl_sendSocket ( return osl_Socket_Error; return send(pSocket->m_Socket, - static_cast<sal_Char const *>(pBuffer), + static_cast<char const *>(pBuffer), BytesToSend, MSG_FLAG_TO_NATIVE(Flag)); } @@ -1165,7 +1165,7 @@ sal_Int32 SAL_CALL osl_sendToSocket ( pSystemSockAddr = &(ReceiverAddr->m_sockaddr); return sendto(pSocket->m_Socket, - static_cast<sal_Char const *>(pBuffer), + static_cast<char const *>(pBuffer), BytesToSend, MSG_FLAG_TO_NATIVE(Flag), pSystemSockAddr, @@ -1358,7 +1358,7 @@ sal_Bool SAL_CALL osl_setSocketOption ( return(setsockopt(pSocket->m_Socket, OPTION_LEVEL_TO_NATIVE(Level), OPTION_TO_NATIVE(Option), - static_cast<sal_Char*>(pBuffer), + static_cast<char*>(pBuffer), BufferLen) == 0); } diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 63841f6456ef..c8a7ccce2a89 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -41,7 +41,7 @@ namespace rtl_OStringBuffer void ctor_001() { OStringBuffer aStrBuf; - const sal_Char* pStr = aStrBuf.getStr(); + const char* pStr = aStrBuf.getStr(); CPPUNIT_ASSERT_MESSAGE ( @@ -95,8 +95,8 @@ namespace rtl_OStringBuffer OStringBuffer aStrBuf1(kTestStr2Len); OStringBuffer aStrBuf2(0); - const sal_Char* pStr1 = aStrBuf1.getStr(); - const sal_Char* pStr2 = aStrBuf2.getStr(); + const char* pStr1 = aStrBuf1.getStr(); + const char* pStr2 = aStrBuf2.getStr(); CPPUNIT_ASSERT_MESSAGE ( @@ -1361,12 +1361,12 @@ namespace rtl_OStringBuffer { void csuc_001() { - const sal_Char* expVal = kTestStr1; + const char* expVal = kTestStr1; OStringBuffer aStrBuf( kTestStr1 ); sal_Int32 cmpLen = kTestStr1Len; - // LLA: wrong access! const sal_Char* pstr = *&aStrBuf; - const sal_Char* pstr = aStrBuf.getStr(); + // LLA: wrong access! const char* pstr = *&aStrBuf; + const char* pstr = aStrBuf.getStr(); int nEqual = strncmp(pstr, expVal, cmpLen); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -1382,8 +1382,8 @@ namespace rtl_OStringBuffer { OStringBuffer aStrBuf; - // LLA: wrong access! const sal_Char* pstr = *&aStrBuf; - const sal_Char* pstr = aStrBuf.getStr(); + // LLA: wrong access! const char* pstr = *&aStrBuf; + const char* pstr = aStrBuf.getStr(); sal_Int32 nLen = strlen(pstr); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -1405,11 +1405,11 @@ namespace rtl_OStringBuffer { void getStr_001() { - const sal_Char* expVal = kTestStr1; + const char* expVal = kTestStr1; OStringBuffer aStrBuf( kTestStr1 ); sal_Int32 cmpLen = kTestStr1Len; - const sal_Char* pstr = aStrBuf.getStr(); + const char* pstr = aStrBuf.getStr(); int nEqual = strncmp(pstr, expVal, cmpLen); CPPUNIT_ASSERT_EQUAL_MESSAGE @@ -1423,7 +1423,7 @@ namespace rtl_OStringBuffer void getStr_002() { OStringBuffer aStrBuf; - const sal_Char* pstr = aStrBuf.getStr(); + const char* pstr = aStrBuf.getStr(); CPPUNIT_ASSERT_MESSAGE ( "test empty string", @@ -1859,7 +1859,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input = kTestStr8; + const char* input = kTestStr8; aStrBuf.append( input ); @@ -1875,7 +1875,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input = kTestStr36; + const char* input = kTestStr36; aStrBuf.append( input ); @@ -1891,7 +1891,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr37 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input = kTestStr23; + const char* input = kTestStr23; aStrBuf.append( input ); @@ -1907,7 +1907,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input = kTestStr25; + const char* input = kTestStr25; aStrBuf.append( input ); @@ -1923,7 +1923,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input = kTestStr7; + const char* input = kTestStr7; aStrBuf.append( input ); @@ -1939,7 +1939,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input = kTestStr2; + const char* input = kTestStr2; aStrBuf.append( input ); @@ -1955,7 +1955,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input = kTestStr1; + const char* input = kTestStr1; aStrBuf.append( input ); @@ -1971,7 +1971,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input = kTestStr25; + const char* input = kTestStr25; aStrBuf.append( input ); @@ -1987,7 +1987,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input = kTestStr7; + const char* input = kTestStr7; aStrBuf.append( input ); @@ -2003,7 +2003,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input = kTestStr2; + const char* input = kTestStr2; aStrBuf.append( input ); @@ -2019,7 +2019,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input = kTestStr1; + const char* input = kTestStr1; aStrBuf.append( input ); @@ -2035,7 +2035,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input = kTestStr25; + const char* input = kTestStr25; aStrBuf.append( input ); @@ -2051,7 +2051,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input = kTestStr7; + const char* input = kTestStr7; aStrBuf.append( input ); @@ -2067,7 +2067,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input = kTestStr2; + const char* input = kTestStr2; aStrBuf.append( input ); @@ -2083,7 +2083,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input = kTestStr1; + const char* input = kTestStr1; aStrBuf.append( input ); @@ -2099,7 +2099,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input = kTestStr25; + const char* input = kTestStr25; aStrBuf.append( input ); @@ -2115,7 +2115,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr29 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input = kTestStr38; + const char* input = kTestStr38; aStrBuf.append( input ); @@ -2131,7 +2131,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr39 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input = kTestStr17; + const char* input = kTestStr17; aStrBuf.append( input ); @@ -2147,7 +2147,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr40 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input = kTestStr31; + const char* input = kTestStr31; aStrBuf.append( input ); @@ -2163,7 +2163,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr28 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input = kTestStr25; + const char* input = kTestStr25; aStrBuf.append( input ); @@ -2180,7 +2180,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( kSInt32Max ); - const sal_Char* input = kTestStr25; + const char* input = kTestStr25; aStrBuf.append( input ); @@ -2239,7 +2239,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input1 = kTestStr36; + const char* input1 = kTestStr36; sal_Int32 input2 = 12; aStrBuf.append( input1, input2 ); @@ -2256,7 +2256,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input1 = kTestStr36; + const char* input1 = kTestStr36; sal_Int32 input2 = 28; aStrBuf.append( input1, input2 ); @@ -2273,7 +2273,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr37 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input1 = kTestStr23; + const char* input1 = kTestStr23; sal_Int32 input2 = 16; aStrBuf.append( input1, input2 ); @@ -2290,7 +2290,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[0] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 0; aStrBuf.append( input1, input2 ); @@ -2307,7 +2307,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 4; aStrBuf.append( input1, input2 ); @@ -2324,7 +2324,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 32; aStrBuf.append( input1, input2 ); @@ -2341,7 +2341,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 16; aStrBuf.append( input1, input2 ); @@ -2358,7 +2358,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( arrOUS[1] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 0; aStrBuf.append( input1, input2 ); @@ -2375,7 +2375,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 4; aStrBuf.append( input1, input2 ); @@ -2392,7 +2392,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 32; aStrBuf.append( input1, input2 ); @@ -2409,7 +2409,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 16; aStrBuf.append( input1, input2 ); @@ -2426,7 +2426,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( arrOUS[2] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 0; aStrBuf.append( input1, input2 ); @@ -2443,7 +2443,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr7 ); OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 4; aStrBuf.append( input1, input2 ); @@ -2460,7 +2460,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr2 ); OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 32; aStrBuf.append( input1, input2 ); @@ -2477,7 +2477,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr1 ); OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 16; aStrBuf.append( input1, input2 ); @@ -2494,7 +2494,7 @@ namespace rtl_OStringBuffer { OString expVal; OStringBuffer aStrBuf( arrOUS[3] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 0; aStrBuf.append( input1, input2 ); @@ -2511,7 +2511,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr29 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input1 = kTestStr38; + const char* input1 = kTestStr38; sal_Int32 input2 = 7; aStrBuf.append( input1, input2 ); @@ -2528,7 +2528,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr39 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input1 = kTestStr17; + const char* input1 = kTestStr17; sal_Int32 input2 = 22; aStrBuf.append( input1, input2 ); @@ -2545,7 +2545,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr40 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input1 = kTestStr31; + const char* input1 = kTestStr31; sal_Int32 input2 = 16; aStrBuf.append( input1, input2 ); @@ -2562,7 +2562,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr28 ); OStringBuffer aStrBuf( arrOUS[4] ); - const sal_Char* input1 = kTestStr2; + const char* input1 = kTestStr2; sal_Int32 input2 = 0; aStrBuf.append( input1, input2 ); @@ -2826,7 +2826,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// testing the method append(sal_Char c) +// testing the method append(char c) class append_005 : public CppUnit::TestFixture { @@ -2847,13 +2847,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr51 ); OStringBuffer aStrBuf( arrOUS[0] ); - sal_Char input = 'M'; + char input = 'M'; aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(M) to the string buffer arrOUS[0]", + "Appends the char(M) to the string buffer arrOUS[0]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2863,7 +2863,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr143 ); OStringBuffer aStrBuf( arrOUS[0] ); - sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8); + char input = static_cast<char>(SAL_MAX_UINT8); aStrBuf.append( input ); @@ -2879,13 +2879,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr27 ); OStringBuffer aStrBuf( arrOUS[1] ); - sal_Char input = 's'; + char input = 's'; aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(s) to the string buffer arrOUS[1]", + "Appends the char(s) to the string buffer arrOUS[1]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2895,13 +2895,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr144 ); OStringBuffer aStrBuf( arrOUS[1] ); - sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8); + char input = static_cast<char>(SAL_MAX_UINT8); aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(kSInt8Max) to the string buffer arrOUS[1]", + "Appends the char(kSInt8Max) to the string buffer arrOUS[1]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2911,13 +2911,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr27 ); OStringBuffer aStrBuf( arrOUS[2] ); - sal_Char input = 's'; + char input = 's'; aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(s) to the string buffer arrOUS[2]", + "Appends the char(s) to the string buffer arrOUS[2]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2927,13 +2927,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr144 ); OStringBuffer aStrBuf( arrOUS[2] ); - sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8); + char input = static_cast<char>(SAL_MAX_UINT8); aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(kSInt8Max) to the string buffer arrOUS[2]", + "Appends the char(kSInt8Max) to the string buffer arrOUS[2]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2943,13 +2943,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr27 ); OStringBuffer aStrBuf( arrOUS[3] ); - sal_Char input = 's'; + char input = 's'; aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(s) to the string buffer arrOUS[3]", + "Appends the char(s) to the string buffer arrOUS[3]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2959,13 +2959,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr144 ); OStringBuffer aStrBuf( arrOUS[3] ); - sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8); + char input = static_cast<char>(SAL_MAX_UINT8); aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(kSInt8Max) to the string buffer arrOUS[3]", + "Appends the char(kSInt8Max) to the string buffer arrOUS[3]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2975,13 +2975,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr56 ); OStringBuffer aStrBuf( arrOUS[4] ); - sal_Char input = 's'; + char input = 's'; aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(s) to the string buffer arrOUS[4]", + "Appends the char(s) to the string buffer arrOUS[4]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -2991,13 +2991,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr145 ); OStringBuffer aStrBuf( arrOUS[4] ); - sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8); + char input = static_cast<char>(SAL_MAX_UINT8); aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(kSInt8Max) to the string buffer arrOUS[4]", + "Appends the char(kSInt8Max) to the string buffer arrOUS[4]", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -3008,13 +3008,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr27 ); OStringBuffer aStrBuf( kSInt32Max ); - sal_Char input = 's'; + char input = 's'; aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(s) to the string buffer(with INT_MAX)", + "Appends the char(s) to the string buffer(with INT_MAX)", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); @@ -3024,13 +3024,13 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr144 ); OStringBuffer aStrBuf( kSInt32Max ); - sal_Char input = static_cast<sal_Char>(SAL_MAX_UINT8); + char input = static_cast<char>(SAL_MAX_UINT8); aStrBuf.append( input ); CPPUNIT_ASSERT_MESSAGE ( - "Appends the sal_Char(kSInt8Max) to the string buffer with INT_MAX)", + "Appends the char(kSInt8Max) to the string buffer with INT_MAX)", ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() ) ); diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index dca9603f613c..1abdefefcb7a 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -35,61 +35,61 @@ static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_U static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS; static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS; -static const sal_Char * const kTestStr1 = "Sun Microsystems"; -static const sal_Char * const kTestStr2 = "Sun Microsystems Java Technology"; -static const sal_Char * const kTestStr7 = "Sun "; -static const sal_Char * const kTestStr8 = "Microsystems"; -static const sal_Char * const kTestStr14 = " Sun Microsystems"; -static const sal_Char * const kTestStr17 = " Sun Microsystems "; -static const sal_Char * const kTestStr23 = " Java Technology"; -static const sal_Char * const kTestStr25 = ""; -static const sal_Char * const kTestStr27 = "s"; -static const sal_Char * const kTestStr28 = "\50\3\5\7\11\13\15\17sun"; -static const sal_Char * const kTestStr29 = "\50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50"; -static const sal_Char * const kTestStr31 = "sun Microsystems"; -static const sal_Char * const kTestStr36 = "Microsystems Java Technology"; -static const sal_Char * const kTestStr37 = "Sun Java Technology"; -static const sal_Char * const kTestStr38 = "\21\23\25\27\31\33\50"; -static const sal_Char * const kTestStr39 = "\50\3\5\7\11\13\15\17sun Sun Microsystems "; -static const sal_Char * const kTestStr40 = "\50\3\5\7\11\13\15\17sunsun Microsystems"; -static const sal_Char * const kTestStr45 = "Sun true"; -static const sal_Char * const kTestStr46 = "Sun false"; -static const sal_Char * const kTestStr47 = "true"; -static const sal_Char * const kTestStr48 = "false"; -static const sal_Char * const kTestStr49 = "\50\3\5\7\11\13\15\17suntrue"; -static const sal_Char * const kTestStr50 = "\50\3\5\7\11\13\15\17sunfalse"; -static const sal_Char * const kTestStr51 = "Sun M"; -//static const sal_Char *kTestStr52 = "Sun \077777"; -//static const sal_Char *kTestStr53 = "Sun \100000"; -//static const sal_Char *kTestStr54 = "\77777"; -//static const sal_Char *kTestStr55 = "\100000"; -static const sal_Char * const kTestStr56 = "\50\3\5\7\11\13\15\17suns"; -//static const sal_Char *kTestStr57 = "\50\3\5\7\11\13\15\17sun\77777"; -//static const sal_Char *kTestStr58 = "\50\3\5\7\11\13\15\17sun\10000"; -static const sal_Char * const kTestStr59 = "Sun 11"; -static const sal_Char * const kTestStr60 = "11"; -static const sal_Char * const kTestStr61 = "\50\3\5\7\11\13\15\17sun11"; -static const sal_Char * const kTestStr62 = "Sun 0"; -static const sal_Char * const kTestStr63 = "Sun -11"; -static const sal_Char * const kTestStr64 = "Sun 2147483647"; -static const sal_Char * const kTestStr65 = "Sun -2147483648"; -static const sal_Char * const kTestStr66 = "0"; -static const sal_Char * const kTestStr67 = "-11"; -static const sal_Char * const kTestStr68 = "2147483647"; -static const sal_Char * const kTestStr69 = "-2147483648"; -static const sal_Char * const kTestStr70 = "\50\3\5\7\11\13\15\17sun0"; -static const sal_Char * const kTestStr71 = "\50\3\5\7\11\13\15\17sun-11"; -static const sal_Char * const kTestStr72 = "\50\3\5\7\11\13\15\17sun2147483647"; -static const sal_Char * const kTestStr73 = "\50\3\5\7\11\13\15\17sun-2147483648"; -static const sal_Char * const kTestStr116 = "Sun 9223372036854775807"; -static const sal_Char * const kTestStr117 = "Sun -9223372036854775808"; -static const sal_Char * const kTestStr118 = "9223372036854775807"; -static const sal_Char * const kTestStr119 = "-9223372036854775808"; -static const sal_Char * const kTestStr120 = "\50\3\5\7\11\13\15\17sun9223372036854775807"; -static const sal_Char * const kTestStr121 = "\50\3\5\7\11\13\15\17sun-9223372036854775808"; -static const sal_Char * const kTestStr143 = "Sun \377"; -static const sal_Char * const kTestStr144 = "\377"; -static const sal_Char * const kTestStr145 = "\50\3\5\7\11\13\15\17sun\377"; +static const char * const kTestStr1 = "Sun Microsystems"; +static const char * const kTestStr2 = "Sun Microsystems Java Technology"; +static const char * const kTestStr7 = "Sun "; +static const char * const kTestStr8 = "Microsystems"; +static const char * const kTestStr14 = " Sun Microsystems"; +static const char * const kTestStr17 = " Sun Microsystems "; +static const char * const kTestStr23 = " Java Technology"; +static const char * const kTestStr25 = ""; +static const char * const kTestStr27 = "s"; +static const char * const kTestStr28 = "\50\3\5\7\11\13\15\17sun"; +static const char * const kTestStr29 = "\50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50"; +static const char * const kTestStr31 = "sun Microsystems"; +static const char * const kTestStr36 = "Microsystems Java Technology"; +static const char * const kTestStr37 = "Sun Java Technology"; +static const char * const kTestStr38 = "\21\23\25\27\31\33\50"; +static const char * const kTestStr39 = "\50\3\5\7\11\13\15\17sun Sun Microsystems "; +static const char * const kTestStr40 = "\50\3\5\7\11\13\15\17sunsun Microsystems"; +static const char * const kTestStr45 = "Sun true"; +static const char * const kTestStr46 = "Sun false"; +static const char * const kTestStr47 = "true"; +static const char * const kTestStr48 = "false"; +static const char * const kTestStr49 = "\50\3\5\7\11\13\15\17suntrue"; +static const char * const kTestStr50 = "\50\3\5\7\11\13\15\17sunfalse"; +static const char * const kTestStr51 = "Sun M"; +//static const char *kTestStr52 = "Sun \077777"; +//static const char *kTestStr53 = "Sun \100000"; +//static const char *kTestStr54 = "\77777"; +//static const char *kTestStr55 = "\100000"; +static const char * const kTestStr56 = "\50\3\5\7\11\13\15\17suns"; +//static const char *kTestStr57 = "\50\3\5\7\11\13\15\17sun\77777"; +//static const char *kTestStr58 = "\50\3\5\7\11\13\15\17sun\10000"; +static const char * const kTestStr59 = "Sun 11"; +static const char * const kTestStr60 = "11"; +static const char * const kTestStr61 = "\50\3\5\7\11\13\15\17sun11"; +static const char * const kTestStr62 = "Sun 0"; +static const char * const kTestStr63 = "Sun -11"; +static const char * const kTestStr64 = "Sun 2147483647"; +static const char * const kTestStr65 = "Sun -2147483648"; +static const char * const kTestStr66 = "0"; +static const char * const kTestStr67 = "-11"; +static const char * const kTestStr68 = "2147483647"; +static const char * const kTestStr69 = "-2147483648"; +static const char * const kTestStr70 = "\50\3\5\7\11\13\15\17sun0"; +static const char * const kTestStr71 = "\50\3\5\7\11\13\15\17sun-11"; +static const char * const kTestStr72 = "\50\3\5\7\11\13\15\17sun2147483647"; +static const char * const kTestStr73 = "\50\3\5\7\11\13\15\17sun-2147483648"; +static const char * const kTestStr116 = "Sun 9223372036854775807"; +static const char * const kTestStr117 = "Sun -9223372036854775808"; +static const char * const kTestStr118 = "9223372036854775807"; +static const char * const kTestStr119 = "-9223372036854775808"; +static const char * const kTestStr120 = "\50\3\5\7\11\13\15\17sun9223372036854775807"; +static const char * const kTestStr121 = "\50\3\5\7\11\13\15\17sun-9223372036854775808"; +static const char * const kTestStr143 = "Sun \377"; +static const char * const kTestStr144 = "\377"; +static const char * const kTestStr145 = "\50\3\5\7\11\13\15\17sun\377"; static const sal_Int32 kTestStr1Len = 16; static const sal_Int32 kTestStr2Len = 32; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 2f61437ab7f4..2f099586ee73 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -376,7 +376,7 @@ static bool checkDirectory(const OUString& str, oslCheckMode nCheckMode) /** construct error message */ -static OString outputError(const OString & returnVal, const OString & rightVal, const sal_Char * msg = "") +static OString outputError(const OString & returnVal, const OString & rightVal, const char * msg = "") { if (returnVal == rightVal) return OString(); @@ -2202,7 +2202,7 @@ namespace osl_File void ctors_002() { File testFile(aTmpName5); - sal_Char buffer[30] = "Test for File constructor"; + char buffer[30] = "Test for File constructor"; sal_uInt64 nCount; osl::FileBase::RC nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); @@ -2313,8 +2313,8 @@ namespace osl_File void open_006() { File testFile(aCanURL1); - sal_Char buffer_write[30] = "Test for File open"; - sal_Char buffer_read[30]; + char buffer_write[30] = "Test for File open"; + char buffer_read[30]; sal_uInt64 nCount_write, nCount_read; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); @@ -2459,7 +2459,7 @@ namespace osl_File void setPos_001() { File testFile(aTmpName4); - sal_Char buffer_read[2]; + char buffer_read[2]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2477,7 +2477,7 @@ namespace osl_File void setPos_002() { File testFile(aTmpName4); - sal_Char buffer_read[2]; + char buffer_read[2]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2497,7 +2497,7 @@ namespace osl_File void setPos_003() { File testFile(aTmpName4); - sal_Char buffer_read[2]; + char buffer_read[2]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2836,7 +2836,7 @@ namespace osl_File { File testFile(aTmpName4); sal_uInt64 nFilePointer; - sal_Char buffer_read[10]; + char buffer_read[10]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2859,7 +2859,7 @@ namespace osl_File { File testFile(aTmpName4); sal_uInt64 nFilePointer; - sal_Char buffer_read[26]; + char buffer_read[26]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2922,7 +2922,7 @@ namespace osl_File { File testFile(aTmpName6); sal_uInt64 nFilePointer; - sal_Char buffer_read[10]; + char buffer_read[10]; nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2978,7 +2978,7 @@ namespace osl_File // write some strings into the file. File testFile(aTmpName6); - sal_Char ppStrSeq[3][27] = { "abcde\n", + char ppStrSeq[3][27] = { "abcde\n", "1234567890\n", "ABCDEFGHIJKLMNOPQRSTUVWXYZ" }; diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index d1dff529dfb2..6cf324f29686 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -56,9 +56,9 @@ extern "C" // so, a common test data repository will be better since it can be // shared among all test code -const sal_Char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; -const sal_Char pBuffer_Number[] = "1234567890"; -const sal_Char pBuffer_Blank[] = ""; +const char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; +const char pBuffer_Number[] = "1234567890"; +const char pBuffer_Blank[] = ""; // OS dependent/independent definitions/includes // we use FILE_PREFIX for URL prefix, diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index d7bedb5baaa8..0237fa57a411 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -749,7 +749,7 @@ namespace osl_StreamPipe class Pipe_DataSink_Thread : public Thread { public: - sal_Char buf[256]; + char buf[256]; Pipe_DataSink_Thread( ) { } protected: @@ -787,7 +787,7 @@ namespace osl_StreamPipe class Pipe_DataSource_Thread : public Thread { public: - sal_Char buf[256]; + char buf[256]; ::osl::Pipe aListenPipe; ::osl::StreamPipe aConnectionPipe; Pipe_DataSource_Thread( ) diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 5a7d1a11ef38..7cfabcab79be 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -496,7 +496,7 @@ namespace rtl_str OString aStr1 = "replace char."; OString aShouldStr1 = "ruplacu char."; - sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); + char* pStr = (char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); strcpy(pStr, aStr1.getStr()); @@ -534,7 +534,7 @@ namespace rtl_str OString aStr1 = "replace char."; OString aShouldStr1 = "ruplace char."; - sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); + char* pStr = (char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); strcpy(pStr, aStr1.getStr()); @@ -569,7 +569,7 @@ namespace rtl_str OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; OString aShouldStr1 = "change this to ascii lower case."; - sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); + char* pStr = (char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); strcpy(pStr, aStr1.getStr()); @@ -603,7 +603,7 @@ namespace rtl_str OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; OString aShouldStr1 = "change thiS TO ASCII LOWER CASE."; - sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); + char* pStr = (char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); strcpy(pStr, aStr1.getStr()); @@ -638,7 +638,7 @@ namespace rtl_str OString aStr1 = "change this to ascii upper case."; OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE."; - sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); + char* pStr = (char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); strcpy(pStr, aStr1.getStr()); @@ -672,7 +672,7 @@ namespace rtl_str OString aStr1 = "change this to ascii lower case."; OString aShouldStr1 = "CHANGE THIs to ascii lower case."; - sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); + char* pStr = (char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); strcpy(pStr, aStr1.getStr()); @@ -711,7 +711,7 @@ namespace rtl_str void trim_WithLength_001() { char const *pStr = " trim this"; - sal_Char *pStr2 = strdup(pStr); + char *pStr2 = strdup(pStr); if (pStr2) { rtl_str_trim_WithLength( pStr2, 2 ); @@ -724,7 +724,7 @@ namespace rtl_str void trim_WithLength_002() { char const *pStr = "trim this"; - sal_Char *pStr2 = strdup(pStr); + char *pStr2 = strdup(pStr); if (pStr2) { rtl_str_trim_WithLength( pStr2, 5 ); @@ -737,7 +737,7 @@ namespace rtl_str void trim_WithLength_003() { char const *pStr = " trim this"; - sal_Char *pStr2 = strdup(pStr); + char *pStr2 = strdup(pStr); if (pStr2) { strcpy(pStr2, pStr); @@ -751,7 +751,7 @@ namespace rtl_str void trim_WithLength_004() { char const *pStr = "\r\n\t \n\r trim \n this"; - sal_Char *pStr2 = strdup(pStr); + char *pStr2 = strdup(pStr); if (pStr2) { rtl_str_trim_WithLength( pStr2, 17 ); @@ -764,7 +764,7 @@ namespace rtl_str void trim_WithLength_005() { char const *pStr = "\r\n\t \n\r trim \t this \n\r\t\t "; - sal_Char *pStr2 = strdup(pStr); + char *pStr2 = strdup(pStr); if (pStr2) { rtl_str_trim_WithLength( pStr2, strlen(pStr2) ); @@ -799,7 +799,7 @@ namespace rtl_str } void valueOfChar_001() { - sal_Char *pStr = (sal_Char*)malloc(RTL_STR_MAX_VALUEOFCHAR); + char *pStr = (char*)malloc(RTL_STR_MAX_VALUEOFCHAR); if (pStr) { rtl_str_valueOfChar(pStr, 'A'); diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index 6b7ba799a415..eae3cd5c3abb 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -39,7 +39,7 @@ using namespace osl; /** print a UNI_CODE String. And also print some comments of the string. */ -static void printUString( const OUString & str, const sal_Char * msg ) +static void printUString( const OUString & str, const char * msg ) { if ( msg != nullptr ) { @@ -162,7 +162,7 @@ static void printUuid( const sal_uInt8 *pNode ) /************************************************************************** * output UUID to a string **************************************************************************/ -static void printUuidtoBuffer( const sal_uInt8 *pNode, sal_Char * pBuffer ) +static void printUuidtoBuffer( const sal_uInt8 *pNode, char * pBuffer ) { sal_Int8 nPtr = 0; for( sal_Int32 i1 = 0 ; i1 < 16 ; i1++ ) @@ -201,7 +201,7 @@ public: sal_uInt8 pTargetUUID1[16]; rtl_getGlobalProcessId( pTargetUUID1 ); printUuid( pTargetUUID1 ); - sal_Char pUUID1[32]; + char pUUID1[32]; printUuidtoBuffer( pTargetUUID1, pUUID1 ); printf("# UUID to String is %s\n", pUUID1); @@ -231,7 +231,7 @@ public: //we could get return value only after the process terminated osl_joinProcess(hProcess); - sal_Char pUUID2[33] {}; + char pUUID2[33] {}; sal_uInt64 nRead = 0; osl_readFile( *pChildOutputRead, pUUID2, 32, &nRead ); printf("read buffer is %s, nRead is %" SAL_PRIdINT64 "\n", pUUID2, nRead ); diff --git a/sal/qa/rtl/strings/test_ostring.cxx b/sal/qa/rtl/strings/test_ostring.cxx index 32738125f92a..0d0d07be70ea 100644 --- a/sal/qa/rtl/strings/test_ostring.cxx +++ b/sal/qa/rtl/strings/test_ostring.cxx @@ -92,8 +92,8 @@ void Test::testStartsWithIgnoreAsciiCase() { void Test::testCompareTo() { // test that embedded NUL does not stop the compare - sal_Char str1[2] = { '\0', 'x' }; - sal_Char str2[2] = { '\0', 'y' }; + char str1[2] = { '\0', 'x' }; + char str2[2] = { '\0', 'y' }; OString s1(str1, 2); OString s2(str2, 2); diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index d8c058582c75..eaa16c6eb0b8 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -34,7 +34,7 @@ namespace public: void check(rtl_TextEncoding eIn, rtl_TextEncoding eOut) { - const sal_Char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding(eIn); + const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding(eIn); rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromMimeCharset(pCharSet); CPPUNIT_ASSERT_EQUAL_MESSAGE("rtl_getBestMimeCharsetFromTextEncoding && rtl_getTextEncodingFromMimeCharset differdiffer", eOut, eTextEnc ); } @@ -482,7 +482,7 @@ namespace public: void check(rtl_TextEncoding eIn, rtl_TextEncoding eOut) { - const sal_Char *pCharSet = rtl_getBestUnixCharsetFromTextEncoding(eIn); + const char *pCharSet = rtl_getBestUnixCharsetFromTextEncoding(eIn); rtl_TextEncoding eTextEnc = rtl_getTextEncodingFromUnixCharset(pCharSet); CPPUNIT_ASSERT_EQUAL_MESSAGE("rtl_getBestUnixCharsetFromTextEncoding && rtl_getTextEncodingFromUnixCharset", eOut, eTextEnc ); } diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 0bf6c5647ff0..8e619a23e1ca 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -45,12 +45,12 @@ struct SingleByteCharSet { }; void testSingleByteCharSet(SingleByteCharSet const & rSet) { - sal_Char aText[256]; + char aText[256]; sal_Unicode aUnicode[256]; sal_Size nNumber = 0; for (int i = 0; i < 256; ++i) { if (rSet.m_aMap[i] != 0xFFFF) { - aText[nNumber++] = static_cast< sal_Char >(i); + aText[nNumber++] = static_cast< char >(i); } } { @@ -126,7 +126,7 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) { int j = 0; for (int i = 0; i < 256; ++i) { if (rSet.m_aMap[i] != 0xFFFF - && aText[j] != static_cast< sal_Char >(i)) + && aText[j] != static_cast< char >(i)) { CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(OUString("rSet.m_aMap[" + OUString::number(i) + "] == " + OUString::number(rSet.m_aMap[i], 16)), @@ -135,7 +135,7 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) { CPPUNIT_ASSERT_EQUAL_MESSAGE(OUStringToOString(OUString("aText[" + OUString::number(j) + "] == " + OUString::number(i, 16)), RTL_TEXTENCODING_UTF8).getStr(), - static_cast< sal_Char >(i), aText[j]); + static_cast< char >(i), aText[j]); } if (rSet.m_aMap[i] != 0xFFFF) j++; @@ -143,7 +143,7 @@ void testSingleByteCharSet(SingleByteCharSet const & rSet) { } for (int i = 0; i < 256; ++i) { if (rSet.m_aMap[i] == 0xFFFF) { - aText[0] = static_cast< sal_Char >(i); + aText[0] = static_cast< char >(i); rtl_TextToUnicodeConverter aConverter = rtl_createTextToUnicodeConverter(rSet.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rSet.m_nEncoding)) + ") failed"), @@ -205,7 +205,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { sal_Size nConverted; nSize = rtl_convertTextToUnicode( aConverter, aContext, - reinterpret_cast< sal_Char const * >(rTest.m_pText), + reinterpret_cast< char const * >(rTest.m_pText), rTest.m_nTextSize, aUnicode, TEST_STRING_SIZE, (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR @@ -260,7 +260,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { sal_Size nConverted; sal_Size nSize = rtl_convertTextToUnicode( aConverter, aContext, - reinterpret_cast< sal_Char const * >(rTest.m_pText + nInput), + reinterpret_cast< char const * >(rTest.m_pText + nInput), nSrcBytes, aUnicode + nOutput, TEST_STRING_SIZE - nOutput, nFlags, &nInfo, &nConverted); nOutput += nSize; @@ -295,7 +295,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { if (i == rTest.m_nTextSize) { goto done; } - sal_Char c1 = rTest.m_pText[i++]; + char c1 = rTest.m_pText[i++]; sal_Unicode aUC[2]; sal_uInt32 nInfo = 0; sal_Size nCvtBytes; @@ -308,7 +308,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE : 0)), &nInfo, &nCvtBytes); if ((nInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0) { - sal_Char sBuffer[10]; + char sBuffer[10]; sBuffer[0] = c1; sal_uInt16 nLen = 1; while ((nInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0 @@ -366,7 +366,7 @@ void doComplexCharSetTest(ComplexCharSetTest const & rTest) { } } if (rTest.m_bReverse) { - sal_Char aText[TEST_STRING_SIZE]; + char aText[TEST_STRING_SIZE]; rtl_UnicodeToTextConverter aConverter = rtl_createUnicodeToTextConverter(rTest.m_nEncoding); CPPUNIT_ASSERT_MESSAGE(OUStringToOString(OUString("rtl_createTextToUnicodeConverter(" + OUString::createFromAscii(rtl_getMimeCharsetFromTextEncoding(rTest.m_nEncoding)) + ") failed"), @@ -419,7 +419,7 @@ void doComplexCharSetCutTest(ComplexCharSetTest const & rTest) { sal_uInt32 nInfo; sal_Size nConverted; nSize = rtl_convertTextToUnicode( - aConverter, nullptr, reinterpret_cast< sal_Char const * >(rTest.m_pText), + aConverter, nullptr, reinterpret_cast< char const * >(rTest.m_pText), rTest.m_nTextSize, aUnicode, TEST_STRING_SIZE, (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index d9ad08dfaf52..9fb97d43480e 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -87,7 +87,7 @@ struct StringTraits typedef rtl_String String; static void createString(rtl_String ** pString, - sal_Char const * pChars, sal_Int32 nLen) + char const * pChars, sal_Int32 nLen) { rtl_string_newFromStr_WithLength(pString, pChars, nLen); } @@ -99,7 +99,7 @@ struct StringTraits } static void appendChars(rtl_String ** pBuffer, sal_Int32 * pCapacity, - sal_Int32 * pOffset, sal_Char const * pChars, + sal_Int32 * pOffset, char const * pChars, sal_Int32 nLen) { assert(pChars); @@ -108,7 +108,7 @@ struct StringTraits } static void appendAscii(rtl_String ** pBuffer, sal_Int32 * pCapacity, - sal_Int32 * pOffset, sal_Char const * pStr, + sal_Int32 * pOffset, char const * pStr, sal_Int32 nLen) { assert(pStr); @@ -146,7 +146,7 @@ struct UStringTraits static void appendAscii(rtl_uString ** pBuffer, sal_Int32 * pCapacity, sal_Int32 * pOffset, - sal_Char const * pStr, sal_Int32 nLen) + char const * pStr, sal_Int32 nLen) { rtl_uStringbuffer_insert_ascii(pBuffer, pCapacity, *pOffset, pStr, nLen); @@ -727,9 +727,9 @@ void SAL_CALL rtl_math_doubleToString(rtl_String ** pResult, sal_Int32 nResultOffset, double fValue, rtl_math_StringFormat eFormat, sal_Int32 nDecPlaces, - sal_Char cDecSeparator, + char cDecSeparator, sal_Int32 const * pGroups, - sal_Char cGroupSeparator, + char cGroupSeparator, sal_Bool bEraseTrailingDecZeros) SAL_THROW_EXTERN_C() { @@ -1060,12 +1060,12 @@ double stringToDouble(CharT const * pBegin, CharT const * pEnd, } -double SAL_CALL rtl_math_stringToDouble(sal_Char const * pBegin, - sal_Char const * pEnd, - sal_Char cDecSeparator, - sal_Char cGroupSeparator, +double SAL_CALL rtl_math_stringToDouble(char const * pBegin, + char const * pEnd, + char cDecSeparator, + char cGroupSeparator, rtl_math_ConversionStatus * pStatus, - sal_Char const ** pParsedEnd) + char const ** pParsedEnd) SAL_THROW_EXTERN_C() { return stringToDouble( diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx index 2b7d8e96a8d1..da9ebaf689b0 100644 --- a/sal/rtl/strbuf.cxx +++ b/sal/rtl/strbuf.cxx @@ -27,7 +27,7 @@ * rtl_stringbuffer_newFromStr_WithLength */ void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr, - const sal_Char * value, + const char * value, sal_Int32 count ) { assert(newStr); @@ -106,7 +106,7 @@ void SAL_CALL rtl_stringbuffer_ensureCapacity void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, sal_Int32 * capacity, sal_Int32 offset, - const sal_Char * str, + const char * str, sal_Int32 len ) { assert(This); @@ -114,7 +114,7 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, assert(offset >= 0 && offset <= (**This).length); assert(len >= 0); sal_Int32 nOldLen; - sal_Char * pBuf; + char * pBuf; sal_Int32 n; if( len != 0 ) { @@ -130,7 +130,7 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, /* optimized for 1 character */ pBuf[offset + len] = pBuf[offset]; else if( n > 1 ) - memmove( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Char) ); + memmove( pBuf + offset + len, pBuf + offset, n * sizeof(char) ); /* insert the new characters */ if( str != nullptr ) @@ -139,7 +139,7 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This, /* optimized for 1 character */ pBuf[offset] = *str; else - memcpy( pBuf + offset, str, len * sizeof(sal_Char) ); + memcpy( pBuf + offset, str, len * sizeof(char) ); } (*This)->length = nOldLen + len; pBuf[ nOldLen + len ] = 0; @@ -157,7 +157,7 @@ void SAL_CALL rtl_stringbuffer_remove( rtl_String ** This, assert(start >= 0 && start <= (**This).length); assert(len >= 0); sal_Int32 nTailLen; - sal_Char * pBuf; + char * pBuf; if (len > (*This)->length - start) len = (*This)->length - start; @@ -172,7 +172,7 @@ void SAL_CALL rtl_stringbuffer_remove( rtl_String ** This, if (nTailLen) { /* move the tail */ - memmove(pBuf + start, pBuf + start + len, nTailLen * sizeof(sal_Char)); + memmove(pBuf + start, pBuf + start + len, nTailLen * sizeof(char)); } (*This)->length-=len; diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 1d2c5488a15a..13bf7542c885 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -43,7 +43,7 @@ static rtl_String const aImplEmpty_rtl_String = SAL_STRING_STATIC_FLAG|1, /* sal_Int32 refCount; */ 0, /* sal_Int32 length; */ - { 0 } /* sal_Char buffer[1]; */ + { 0 } /* char buffer[1]; */ }; /* ======================================================================= */ @@ -54,7 +54,7 @@ static rtl_String const aImplEmpty_rtl_String = #define IMPL_RTL_IS_USTRING 0 -#define IMPL_RTL_STRCODE sal_Char +#define IMPL_RTL_STRCODE char #define IMPL_RTL_USTRCODE( c ) (static_cast<unsigned char>(c)) #define IMPL_RTL_STRNAME( n ) rtl_str_ ## n @@ -81,7 +81,7 @@ static rtl_String const aImplEmpty_rtl_String = #undef IMPL_RTL_USTRCODE #undef RTL_LOG_STRING_BITS -sal_Int32 SAL_CALL rtl_str_valueOfFloat(sal_Char * pStr, float f) +sal_Int32 SAL_CALL rtl_str_valueOfFloat(char * pStr, float f) SAL_THROW_EXTERN_C() { assert(pStr); @@ -93,12 +93,12 @@ sal_Int32 SAL_CALL rtl_str_valueOfFloat(sal_Char * pStr, float f) true); nLen = pResult->length; OSL_ASSERT(nLen < RTL_STR_MAX_VALUEOFFLOAT); - memcpy(pStr, pResult->buffer, (nLen + 1) * sizeof(sal_Char)); + memcpy(pStr, pResult->buffer, (nLen + 1) * sizeof(char)); rtl_string_release(pResult); return nLen; } -sal_Int32 SAL_CALL rtl_str_valueOfDouble(sal_Char * pStr, double d) +sal_Int32 SAL_CALL rtl_str_valueOfDouble(char * pStr, double d) SAL_THROW_EXTERN_C() { assert(pStr); @@ -110,19 +110,19 @@ sal_Int32 SAL_CALL rtl_str_valueOfDouble(sal_Char * pStr, double d) 0, true); nLen = pResult->length; OSL_ASSERT(nLen < RTL_STR_MAX_VALUEOFDOUBLE); - memcpy(pStr, pResult->buffer, (nLen + 1) * sizeof(sal_Char)); + memcpy(pStr, pResult->buffer, (nLen + 1) * sizeof(char)); rtl_string_release(pResult); return nLen; } -float SAL_CALL rtl_str_toFloat(sal_Char const * pStr) SAL_THROW_EXTERN_C() +float SAL_CALL rtl_str_toFloat(char const * pStr) SAL_THROW_EXTERN_C() { assert(pStr); return static_cast<float>(rtl_math_stringToDouble(pStr, pStr + rtl_str_getLength(pStr), '.', 0, nullptr, nullptr)); } -double SAL_CALL rtl_str_toDouble(sal_Char const * pStr) SAL_THROW_EXTERN_C() +double SAL_CALL rtl_str_toDouble(char const * pStr) SAL_THROW_EXTERN_C() { assert(pStr); return rtl_math_stringToDouble(pStr, pStr + rtl_str_getLength(pStr), '.', 0, @@ -219,7 +219,7 @@ static bool rtl_impl_convertUStringToString(rtl_String ** pTarget, the buffer faster */ if ( nNewLen == static_cast<sal_Size>(nLength) ) { - sal_Char* pBuffer; + char* pBuffer; if ( *pTarget ) rtl_string_release( *pTarget ); *pTarget = rtl_string_ImplAlloc( nLength ); @@ -231,7 +231,7 @@ static bool rtl_impl_convertUStringToString(rtl_String ** pTarget, OSL_ENSURE( *pSource <= 127, "rtl_uString2String() - UTF8 test is encoding is wrong" ); - *pBuffer = static_cast<sal_Char>(static_cast<unsigned char>(*pSource)); + *pBuffer = static_cast<char>(static_cast<unsigned char>(*pSource)); pBuffer++; pSource++; nLength--; diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx index 4e6035d478e2..9ec3cc6efde8 100644 --- a/sal/rtl/strtmpl.cxx +++ b/sal/rtl/strtmpl.cxx @@ -810,8 +810,8 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( valueOfInt32 )( IMPL_RTL_STRCODE* pStr, { assert(pStr); assert( nRadix >= RTL_STR_MIN_RADIX && nRadix <= RTL_STR_MAX_RADIX ); - sal_Char aBuf[RTL_STR_MAX_VALUEOFINT32]; - sal_Char* pBuf = aBuf; + char aBuf[RTL_STR_MAX_VALUEOFINT32]; + char* pBuf = aBuf; sal_Int32 nLen = 0; sal_uInt32 nValue; @@ -833,7 +833,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( valueOfInt32 )( IMPL_RTL_STRCODE* pStr, /* create a recursive buffer with all values, except the last one */ do { - sal_Char nDigit = static_cast<sal_Char>(nValue % nRadix); + char nDigit = static_cast<char>(nValue % nRadix); nValue /= nRadix; if ( nDigit > 9 ) *pBuf = (nDigit-10) + 'a'; @@ -866,8 +866,8 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( valueOfInt64 )( IMPL_RTL_STRCODE* pStr, { assert(pStr); assert( nRadix >= RTL_STR_MIN_RADIX && nRadix <= RTL_STR_MAX_RADIX ); - sal_Char aBuf[RTL_STR_MAX_VALUEOFINT64]; - sal_Char* pBuf = aBuf; + char aBuf[RTL_STR_MAX_VALUEOFINT64]; + char* pBuf = aBuf; sal_Int32 nLen = 0; sal_uInt64 nValue; @@ -889,7 +889,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( valueOfInt64 )( IMPL_RTL_STRCODE* pStr, /* create a recursive buffer with all values, except the last one */ do { - sal_Char nDigit = static_cast<sal_Char>(nValue % nRadix); + char nDigit = static_cast<char>(nValue % nRadix); nValue /= nRadix; if ( nDigit > 9 ) *pBuf = (nDigit-10) + 'a'; @@ -922,8 +922,8 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( valueOfUInt64 )( IMPL_RTL_STRCODE* pStr, { assert(pStr); assert( nRadix >= RTL_STR_MIN_RADIX && nRadix <= RTL_STR_MAX_RADIX ); - sal_Char aBuf[RTL_STR_MAX_VALUEOFUINT64]; - sal_Char* pBuf = aBuf; + char aBuf[RTL_STR_MAX_VALUEOFUINT64]; + char* pBuf = aBuf; sal_Int32 nLen = 0; sal_uInt64 nValue; @@ -936,7 +936,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( valueOfUInt64 )( IMPL_RTL_STRCODE* pStr, /* create a recursive buffer with all values, except the last one */ do { - sal_Char nDigit = static_cast<sal_Char>(nValue % nRadix); + char nDigit = static_cast<char>(nValue % nRadix); nValue /= nRadix; if ( nDigit > 9 ) *pBuf = (nDigit-10) + 'a'; @@ -1399,7 +1399,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromSubString )( IMPL_RTL_STRINGDATA** ppT // Used when creating from string literals. void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral )( IMPL_RTL_STRINGDATA** ppThis, - const sal_Char* pCharStr, + const char* pCharStr, sal_Int32 nLen, sal_Int32 allocExtra ) SAL_THROW_EXTERN_C() diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 592b92c88525..441a6c69f1e8 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -299,7 +299,7 @@ bool writeEscapeChar(rtl_uString ** pBuffer, sal_Int32 * pCapacity, nSrcSize = 2; } - sal_Char aDst[32]; // FIXME random value + char aDst[32]; // FIXME random value sal_uInt32 nInfo; sal_Size nConverted; sal_Size nDstSize = rtl_convertUnicodeToText( diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx index df8250e71a1d..b6f66b9acd1e 100644 --- a/sal/rtl/ustrbuf.cxx +++ b/sal/rtl/ustrbuf.cxx @@ -191,7 +191,7 @@ void rtl_uStringbuffer_insertUtf32( void SAL_CALL rtl_uStringbuffer_insert_ascii( /*inout*/rtl_uString ** This, /*inout*/sal_Int32 * capacity, sal_Int32 offset, - const sal_Char * str, + const char * str, sal_Int32 len) { assert(This); diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index f60fdc95aefc..fca94a2fe6fd 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -207,7 +207,7 @@ double SAL_CALL rtl_ustr_toDouble(sal_Unicode const * pStr) SAL_THROW_EXTERN_C() /* ======================================================================= */ sal_Int32 SAL_CALL rtl_ustr_ascii_compare( const sal_Unicode* pStr1, - const sal_Char* pStr2 ) + const char* pStr2 ) SAL_THROW_EXTERN_C() { assert(pStr1); @@ -231,7 +231,7 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_compare( const sal_Unicode* pStr1, sal_Int32 SAL_CALL rtl_ustr_ascii_compare_WithLength( const sal_Unicode* pStr1, sal_Int32 nStr1Len, - const sal_Char* pStr2 ) + const char* pStr2 ) SAL_THROW_EXTERN_C() { assert(pStr1); @@ -257,7 +257,7 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_compare_WithLength( const sal_Unicode* pStr1, sal_Int32 SAL_CALL rtl_ustr_ascii_shortenedCompare_WithLength( const sal_Unicode* pStr1, sal_Int32 nStr1Len, - const sal_Char* pStr2, + const char* pStr2, sal_Int32 nShortenedLength ) SAL_THROW_EXTERN_C() { @@ -304,13 +304,13 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_shortenedCompare_WithLength( const sal_Unicode sal_Int32 SAL_CALL rtl_ustr_asciil_reverseCompare_WithLength( const sal_Unicode* pStr1, sal_Int32 nStr1Len, - const sal_Char* pStr2, + const char* pStr2, sal_Int32 nStr2Len ) SAL_THROW_EXTERN_C() { assert(nStr1Len >= 0 && nStr2Len >= 0); const sal_Unicode* pStr1Run = pStr1+nStr1Len; - const sal_Char* pStr2Run = pStr2+nStr2Len; + const char* pStr2Run = pStr2+nStr2Len; sal_Int32 nRet; while ( (pStr1 < pStr1Run) && (pStr2 < pStr2Run) ) { @@ -330,13 +330,13 @@ sal_Int32 SAL_CALL rtl_ustr_asciil_reverseCompare_WithLength( const sal_Unicode* /* ----------------------------------------------------------------------- */ sal_Bool SAL_CALL rtl_ustr_asciil_reverseEquals_WithLength( const sal_Unicode* pStr1, - const sal_Char* pStr2, + const char* pStr2, sal_Int32 nStrLen ) SAL_THROW_EXTERN_C() { assert(nStrLen >= 0); const sal_Unicode* pStr1Run = pStr1+nStrLen; - const sal_Char* pStr2Run = pStr2+nStrLen; + const char* pStr2Run = pStr2+nStrLen; while ( pStr1 < pStr1Run ) { /* Check ASCII range */ @@ -354,7 +354,7 @@ sal_Bool SAL_CALL rtl_ustr_asciil_reverseEquals_WithLength( const sal_Unicode* p /* ----------------------------------------------------------------------- */ sal_Int32 SAL_CALL rtl_ustr_ascii_compareIgnoreAsciiCase( const sal_Unicode* pStr1, - const sal_Char* pStr2 ) + const char* pStr2 ) SAL_THROW_EXTERN_C() { assert(pStr1); @@ -390,7 +390,7 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_compareIgnoreAsciiCase( const sal_Unicode* pSt sal_Int32 SAL_CALL rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( const sal_Unicode* pStr1, sal_Int32 nStr1Len, - const sal_Char* pStr2 ) + const char* pStr2 ) SAL_THROW_EXTERN_C() { assert(nStr1Len >= 0); @@ -458,7 +458,7 @@ sal_Int32 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths( sal_Int32 SAL_CALL rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( const sal_Unicode* pStr1, sal_Int32 nStr1Len, - const sal_Char* pStr2, + const char* pStr2, sal_Int32 nShortenedLength ) SAL_THROW_EXTERN_C() { @@ -512,7 +512,7 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( co /* ----------------------------------------------------------------------- */ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** ppThis, - const sal_Char* pCharStr ) + const char* pCharStr ) SAL_THROW_EXTERN_C() { assert(ppThis); @@ -520,7 +520,7 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** ppThis, if ( pCharStr ) { - const sal_Char* pTempStr = pCharStr; + const char* pTempStr = pCharStr; while( *pTempStr ) pTempStr++; nLen = pTempStr-pCharStr; @@ -655,10 +655,10 @@ void rtl_uString_newConcatUtf16L( /* ======================================================================= */ -static int rtl_ImplGetFastUTF8UnicodeLen( const sal_Char* pStr, sal_Int32 nLen, bool * ascii ) +static int rtl_ImplGetFastUTF8UnicodeLen( const char* pStr, sal_Int32 nLen, bool * ascii ) { int n; - const sal_Char* pEndStr; + const char* pEndStr; *ascii = true; n = 0; @@ -695,7 +695,7 @@ static int rtl_ImplGetFastUTF8UnicodeLen( const sal_Char* pStr, sal_Int32 nLen, /* ----------------------------------------------------------------------- */ static void rtl_string2UString_status( rtl_uString** ppThis, - const sal_Char* pStr, + const char* pStr, sal_Int32 nLen, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags, @@ -730,7 +730,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis, } pBuffer = (*ppThis)->buffer; sal_Int32 nLenCopy(nLen); - const sal_Char *pStrCopy(pStr); + const char *pStrCopy(pStr); do { /* Check ASCII range */ @@ -877,7 +877,7 @@ retry: } void SAL_CALL rtl_string2UString( rtl_uString** ppThis, - const sal_Char* pStr, + const char* pStr, sal_Int32 nLen, rtl_TextEncoding eTextEncoding, sal_uInt32 nCvtFlags ) SAL_THROW_EXTERN_C() @@ -974,7 +974,7 @@ static int rtl_canGuessUOutputLength( int len, rtl_TextEncoding eTextEncoding ) } void SAL_CALL rtl_uString_internConvert( rtl_uString ** newStr, - const sal_Char * str, + const char * str, sal_Int32 len, rtl_TextEncoding eTextEncoding, sal_uInt32 convertFlags, diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx index ae25d811df2d..9367bbb747e9 100644 --- a/sal/textenc/convertisciidevangari.cxx +++ b/sal/textenc/convertisciidevangari.cxx @@ -257,13 +257,13 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size sal_Unicode cHighSurrogate = m_cHighSurrogate; sal_uInt32 nInfo = 0; sal_Size nConverted = 0; - sal_Char* pDestBufPtr = pDestBuf; - sal_Char* pDestBufEnd = pDestBuf + nDestBytes; + char* pDestBufPtr = pDestBuf; + char* pDestBufEnd = pDestBuf + nDestBytes; for (; nConverted < nSrcChars; ++nConverted) { bool bUndefined = true; sal_uInt32 c = *pSrcBuf++; - sal_Char cSpecialChar = 0; + char cSpecialChar = 0; if (cHighSurrogate == 0) { if (ImplIsHighSurrogate(c)) @@ -383,7 +383,7 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size { goto no_output; } - *pDestBufPtr++ = static_cast< sal_Char >( + *pDestBufPtr++ = static_cast< char >( ranges[i].byte + (c - ranges[i].unicode)); m_cPrevChar = c; goto done; diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx index 6dc7891a3001..b948ba0fbc5c 100644 --- a/sal/textenc/convertsinglebytetobmpunicode.cxx +++ b/sal/textenc/convertsinglebytetobmpunicode.cxx @@ -32,7 +32,7 @@ #include "unichars.hxx" sal_Size rtl_textenc_convertSingleByteToBmpUnicode( - void const * data, SAL_UNUSED_PARAMETER void *, sal_Char const * srcBuf, + void const * data, SAL_UNUSED_PARAMETER void *, char const * srcBuf, sal_Size srcBytes, sal_Unicode * destBuf, sal_Size destChars, sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtBytes) { @@ -44,7 +44,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode( sal_Unicode * destBufPtr = destBuf; sal_Unicode * destBufEnd = destBuf + destChars; for (; converted < srcBytes; ++converted) { - sal_Char b = *srcBuf++; + char b = *srcBuf++; sal_Unicode c = map[static_cast< sal_uInt8 >(b)]; if (c == 0xFFFF) { goto bad_input; @@ -88,7 +88,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode( sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( void const * data, void * context, - sal_Unicode const * srcBuf, sal_Size srcChars, sal_Char * destBuf, + sal_Unicode const * srcBuf, sal_Size srcChars, char * destBuf, sal_Size destBytes, sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtChars) { @@ -101,8 +101,8 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( sal_Unicode highSurrogate = 0; sal_uInt32 infoFlags = 0; sal_Size converted = 0; - sal_Char * destBufPtr = destBuf; - sal_Char * destBufEnd = destBuf + destBytes; + char * destBufPtr = destBuf; + char * destBufEnd = destBuf + destBytes; if (context != nullptr) { highSurrogate = static_cast< ImplUnicodeToTextContext * >(context)-> m_nHighSurrogate; @@ -139,7 +139,7 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( if (destBufEnd - destBufPtr < 1) { goto no_output; } - *destBufPtr++ = static_cast< sal_Char >( + *destBufPtr++ = static_cast< char >( ranges[i].byte + (c - ranges[i].unicode)); goto done; } diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx index 53749db49d46..aef3f627192c 100644 --- a/sal/textenc/convertsinglebytetobmpunicode.hxx +++ b/sal/textenc/convertsinglebytetobmpunicode.hxx @@ -101,7 +101,7 @@ struct BmpUnicodeToSingleByteConverterData { @see ImplConvertToUnicodeProc */ sal_Size rtl_textenc_convertSingleByteToBmpUnicode( - void const * data, void * context, sal_Char const * srcBuf, + void const * data, void * context, char const * srcBuf, sal_Size srcBytes, sal_Unicode * destBuf, sal_Size destChars, sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtBytes); @@ -112,7 +112,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode( */ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( void const * data, void * context, - sal_Unicode const * srcBuf, sal_Size srcChars, sal_Char * destBuf, + sal_Unicode const * srcBuf, sal_Size srcChars, char * destBuf, sal_Size destBytes, sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtChars); diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index b69cf4c586fd..c2ee6850f515 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -201,7 +201,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinC /* ----------------------------------------------------------------------- */ -rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pUnixCharset ) +rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixCharset ) { /* See <ftp://ftp.x.org/pub/DOCS/registry>, section 14 ("Font Charset * (Registry and Encoding) Names"). @@ -472,7 +472,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pU /* ----------------------------------------------------------------------- */ -rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pMimeCharset ) +rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeCharset ) { /* All Identifiers are in lower case and contain only alphanumeric */ /* characters. The function search for the first equal string in */ @@ -792,7 +792,7 @@ sal_uInt8 SAL_CALL rtl_getBestWindowsCharsetFromTextEncoding( rtl_TextEncoding e /* ----------------------------------------------------------------------- */ -const sal_Char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ) +const char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ) { const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding ); if ( pData ) @@ -812,7 +812,7 @@ char const * SAL_CALL rtl_getMimeCharsetFromTextEncoding(rtl_TextEncoding p->mpBestMimeCharset : nullptr; } -const sal_Char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ) +const char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ) { const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding ); if ( pData ) diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx index 3ab1c9aea562..2d5add0a89e4 100644 --- a/sal/textenc/textcvt.cxx +++ b/sal/textenc/textcvt.cxx @@ -155,7 +155,7 @@ void SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConvert sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverter, rtl_TextToUnicodeContext hContext, - const sal_Char* pSrcBuf, sal_Size nSrcBytes, + const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) @@ -251,7 +251,7 @@ void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConvert sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverter, rtl_UnicodeToTextContext hContext, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, - sal_Char* pDestBuf, sal_Size nDestBytes, + char* pDestBuf, sal_Size nDestBytes, sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtChars ) { diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index 103ef46344cb..3e318d8827c3 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -476,7 +476,7 @@ Sequence<sal_Int8> Unicode2TextConverter::convert(const sal_Unicode *puSource , sal_Int32 nSeqSize = nSourceSize * 3; Sequence<sal_Int8> seqText( nSeqSize ); - sal_Char *pTarget = reinterpret_cast<char *>(seqText.getArray()); + char *pTarget = reinterpret_cast<char *>(seqText.getArray()); while( true ) { nTargetCount += rtl_convertUnicodeToText( diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 55e1a345f331..2b843d03c74f 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -50,7 +50,7 @@ #include <libxml/parser.h> // Inverse of libxml's BAD_CAST. -#define XML_CAST( str ) reinterpret_cast< const sal_Char* >( str ) +#define XML_CAST( str ) reinterpret_cast< const char* >( str ) using namespace std; using namespace ::osl; @@ -547,7 +547,7 @@ Event& Entity::getEvent( CallbackType aType ) OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, const OUString& sSystemId, sal_Int32 nLine ) { - const sal_Char* pMessage; + const char* pMessage; xmlErrorPtr error = xmlCtxtGetLastError( ctxt ); if( error && error->message ) pMessage = error->message; diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index b612f4d7b7e6..42fb660bbcdf 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -42,11 +42,11 @@ using namespace ::com::sun::star::i18n; namespace sax { -static const sal_Char* const gpsMM = "mm"; -static const sal_Char* const gpsCM = "cm"; -static const sal_Char* const gpsPT = "pt"; -static const sal_Char* const gpsINCH = "in"; -static const sal_Char* const gpsPC = "pc"; +static const char* const gpsMM = "mm"; +static const char* const gpsCM = "cm"; +static const char* const gpsPT = "pt"; +static const char* const gpsINCH = "in"; +static const char* const gpsPC = "pc"; const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 14; @@ -125,8 +125,8 @@ bool Converter::convertMeasure( sal_Int32& rValue, OSL_ENSURE( MeasureUnit::TWIP == nTargetUnit || MeasureUnit::POINT == nTargetUnit || MeasureUnit::MM_100TH == nTargetUnit || MeasureUnit::MM_10TH == nTargetUnit || MeasureUnit::PIXEL == nTargetUnit, "unit is not supported"); - const sal_Char *aCmpsL[3] = { nullptr, nullptr, nullptr }; - const sal_Char *aCmpsU[3] = { nullptr, nullptr, nullptr }; + const char *aCmpsL[3] = { nullptr, nullptr, nullptr }; + const char *aCmpsU[3] = { nullptr, nullptr, nullptr }; double aScales[3] = { 1., 1., 1. }; if( MeasureUnit::TWIP == nTargetUnit ) @@ -219,10 +219,10 @@ bool Converter::convertMeasure( sal_Int32& rValue, for( sal_uInt16 i= 0; i < 3; i++ ) { sal_Int32 nTmp = nPos; // come back to the initial position before each iteration - const sal_Char *pL = aCmpsL[i]; + const char *pL = aCmpsL[i]; if( pL ) { - const sal_Char *pU = aCmpsU[i]; + const char *pU = aCmpsU[i]; while( nTmp < nLen && *pL ) { sal_Unicode c = rString[nTmp]; @@ -291,7 +291,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer, long nMul = 1000; long nDiv = 1; long nFac = 100; - const sal_Char* psUnit = nullptr; + const char* psUnit = nullptr; switch( nSourceUnit ) { case MeasureUnit::TWIP: @@ -492,7 +492,7 @@ bool Converter::convertColor( sal_Int32& rColor, const OUString& rValue ) return true; } -static const sal_Char aHexTab[] = "0123456789abcdef"; +static const char aHexTab[] = "0123456789abcdef"; /** convert color to string */ void Converter::convertColor( OUStringBuffer& rBuffer, sal_Int32 nColor ) @@ -1883,7 +1883,7 @@ double Converter::GetConversionFactor(OUStringBuffer& rUnit, sal_Int16 nSourceUn if(nSourceUnit != nTargetUnit) { - const sal_Char* psUnit = nullptr; + const char* psUnit = nullptr; switch(nSourceUnit) { diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index 91df59d05107..9b65718764fc 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -61,7 +61,7 @@ FastAttributeList::FastAttributeList( const css::uno::Reference< css::xml::sax:: { // random initial size of buffer to store attribute values mnChunkLength = 58; - mpChunk = static_cast<sal_Char *>(malloc( mnChunkLength )); + mpChunk = static_cast<char *>(malloc( mnChunkLength )); maAttributeValues.push_back( 0 ); } @@ -78,7 +78,7 @@ void FastAttributeList::clear() maUnknownAttributes.clear(); } -void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue, size_t nValueLength ) +void FastAttributeList::add( sal_Int32 nToken, const char* pValue, size_t nValueLength ) { assert(nToken != -1); maAttributeTokens.push_back( nToken ); @@ -87,7 +87,7 @@ void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue, size_t nV if (maAttributeValues.back() > mnChunkLength) { const sal_Int32 newLen = std::max(mnChunkLength * 2, maAttributeValues.back()); - if (auto p = static_cast<sal_Char*>(realloc(mpChunk, newLen))) + if (auto p = static_cast<char*>(realloc(mpChunk, newLen))) { mnChunkLength = newLen; mpChunk = p; @@ -99,7 +99,7 @@ void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue, size_t nV mpChunk[nWritePosition + nValueLength] = '\0'; } -void FastAttributeList::add( sal_Int32 nToken, const sal_Char* pValue ) +void FastAttributeList::add( sal_Int32 nToken, const char* pValue ) { add( nToken, pValue, strlen( pValue )); } diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index a362ff438383..cd07e7425c71 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -315,13 +315,13 @@ namespace sax_fastparser { mxFastTokenHandler->getUTF8Identifier(NAMESPACE(nElement))); Sequence<sal_Int8> const name( mxFastTokenHandler->getUTF8Identifier(TOKEN(nElement))); - return OString(reinterpret_cast<sal_Char const*>(ns.getConstArray()), ns.getLength()) + return OString(reinterpret_cast<char const*>(ns.getConstArray()), ns.getLength()) + OString(sColon, N_CHARS(sColon)) - + OString(reinterpret_cast<sal_Char const*>(name.getConstArray()), name.getLength()); + + OString(reinterpret_cast<char const*>(name.getConstArray()), name.getLength()); } else { Sequence<sal_Int8> const name( mxFastTokenHandler->getUTF8Identifier(nElement)); - return OString(reinterpret_cast<sal_Char const*>(name.getConstArray()), name.getLength()); + return OString(reinterpret_cast<char const*>(name.getConstArray()), name.getLength()); } } #endif diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index 06b0421c248b..882a7a96dfa7 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -756,7 +756,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/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index 505e3d8a410f..2a5d3706d48f 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -470,7 +470,7 @@ void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r // Test added for mib. Tests if errors during conversions occurs r->ignorableWhitespace( OUString() ); - sal_Char array[256]; + char array[256]; for( sal_Int32 n = 32 ; n < 254 ; n ++ ) { array[n-32] = n; } diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx index 9b6091fb9cae..51f8f244e062 100644 --- a/sax/test/testcomponent.cxx +++ b/sax/test/testcomponent.cxx @@ -76,7 +76,7 @@ int main (int argc, char **argv) exit(1); } - sal_Char szBuf[1024]; + char szBuf[1024]; OString sTestName; try |