diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-23 11:57:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-23 15:12:42 +0100 |
commit | febb1b2861ce276ad79fccd95e9eadc9e435603c (patch) | |
tree | 63a81010b67c2994302d80b4f2564fb1dcdad13e /ucb/source/ucp/ftp | |
parent | 1a53e60d444385c9b97ed16d245edbd44f8a5ac4 (diff) |
sal_Char->char in ucb
Change-Id: Ib8b14df44da17fb0ebb12f160b66573183f7a17e
Reviewed-on: https://gerrit.libreoffice.org/85745
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/ucp/ftp')
-rw-r--r-- | ucb/source/ucp/ftp/ftpdirp.cxx | 44 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdirp.hxx | 28 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpservices.cxx | 2 |
3 files changed, 37 insertions, 37 deletions
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index 6162432be141..723f78b51cef 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -58,7 +58,7 @@ static bool ascii_isWhitespace( sal_Unicode ch ) bool FTPDirectoryParser::parseDOS ( FTPDirentry &rEntry, - const sal_Char *pBuffer) + const char *pBuffer) { bool bDirectory = false; sal_uInt32 nSize = 0; @@ -86,7 +86,7 @@ bool FTPDirectoryParser::parseDOS ( int nDigits = 0; enum StateType eState = STATE_INIT_LWS; - for (const sal_Char *p = pBuffer; + for (const char *p = pBuffer; eState != STATE_ERROR && *p; ++p) { @@ -555,14 +555,14 @@ bool FTPDirectoryParser::parseDOS ( */ bool FTPDirectoryParser::parseVMS ( FTPDirentry &rEntry, - const sal_Char *pBuffer) + const char *pBuffer) { static OUString aFirstLineName; static bool bFirstLineDir = false; for (bool bFirstLine = true;; bFirstLine = false) { - const sal_Char *p = pBuffer; + const char *p = pBuffer; if (bFirstLine) { // Skip <*lws> part: @@ -570,7 +570,7 @@ bool FTPDirectoryParser::parseVMS ( ++p; // Parse <filename "."> part: - const sal_Char *pFileName = p; + const char *pFileName = p; while ((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || @@ -586,7 +586,7 @@ bool FTPDirectoryParser::parseVMS ( } // Parse <filetype ";"> part: - const sal_Char *pFileType = ++p; + const char *pFileType = ++p; while ((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || @@ -721,7 +721,7 @@ bool FTPDirectoryParser::parseVMS ( return false; // Parse <month "-"> part and set entry date's month: - sal_Char const * pMonth = p; + char const * pMonth = p; sal_Int32 const monthLen = 3; for (int i = 0; i < monthLen; ++i) { @@ -842,9 +842,9 @@ bool FTPDirectoryParser::parseVMS ( */ bool FTPDirectoryParser::parseUNIX ( FTPDirentry &rEntry, - const sal_Char *pBuffer) + const char *pBuffer) { - const sal_Char *p1, *p2; + const char *p1, *p2; p1 = p2 = pBuffer; if (!((*p1 == '-') || (*p1 == 'd') || (*p1 == 'l'))) @@ -876,8 +876,8 @@ bool FTPDirectoryParser::parseUNIX ( FOUND_NONE, FOUND_SIZE, FOUND_MONTH, FOUND_DAY, FOUND_YEAR_TIME }; - const sal_Char *pDayStart = nullptr; - const sal_Char *pDayEnd = nullptr; + const char *pDayStart = nullptr; + const char *pDayEnd = nullptr; Mode eMode; for (eMode = FOUND_NONE; *p1 && eMode != FOUND_YEAR_TIME; p1 = p2 + 1) { @@ -950,8 +950,8 @@ bool FTPDirectoryParser::parseUNIX ( * parseUNIX_isSizeField. */ bool FTPDirectoryParser::parseUNIX_isSizeField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, sal_uInt32 &rSize) { if (!*pStart || !*pEnd || pStart == pEnd) @@ -1003,8 +1003,8 @@ bool FTPDirectoryParser::parseUNIX_isSizeField ( * parseUNIX_isMonthField. */ bool FTPDirectoryParser::parseUNIX_isMonthField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, DateTime &rDateTime) { if (!*pStart || !*pEnd || pStart + 3 != pEnd) @@ -1101,8 +1101,8 @@ bool FTPDirectoryParser::parseUNIX_isMonthField ( * parseUNIX_isDayField. */ bool FTPDirectoryParser::parseUNIX_isDayField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, DateTime &rDateTime) { if (!*pStart || !*pEnd || pStart == pEnd) @@ -1128,8 +1128,8 @@ bool FTPDirectoryParser::parseUNIX_isDayField ( * parseUNIX_isYearTimeField. */ bool FTPDirectoryParser::parseUNIX_isYearTimeField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, DateTime &rDateTime) { if (!*pStart || !*pEnd || pStart == pEnd || @@ -1175,8 +1175,8 @@ bool FTPDirectoryParser::parseUNIX_isYearTimeField ( * parseUNIX_isTime. */ bool FTPDirectoryParser::parseUNIX_isTime ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, sal_uInt16 nHour, DateTime &rDateTime) { @@ -1255,7 +1255,7 @@ void FTPDirectoryParser::setYear ( * setPath. */ bool FTPDirectoryParser::setPath ( - OUString &rPath, const sal_Char *value, sal_Int32 length) + OUString &rPath, const char *value, sal_Int32 length) { if (value) { diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 424e0d42d7c8..fa81e1e33e36 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -103,42 +103,42 @@ namespace ftp { public: static bool parseDOS ( FTPDirentry &rEntry, - const sal_Char *pBuffer ); + const char *pBuffer ); static bool parseVMS ( FTPDirentry &rEntry, - const sal_Char *pBuffer ); + const char *pBuffer ); static bool parseUNIX ( FTPDirentry &rEntry, - const sal_Char *pBuffer ); + const char *pBuffer ); private: static bool parseUNIX_isSizeField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, sal_uInt32 &rSize); static bool parseUNIX_isMonthField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, DateTime& rDateTime); static bool parseUNIX_isDayField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, DateTime& rDateTime); static bool parseUNIX_isYearTimeField ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, DateTime& rDateTime); static bool parseUNIX_isTime ( - const sal_Char *pStart, - const sal_Char *pEnd, + const char *pStart, + const char *pEnd, sal_uInt16 nHour, DateTime& rDateTime); @@ -148,7 +148,7 @@ namespace ftp { static bool setPath ( OUString& rPath, - const sal_Char *value, + const char *value, sal_Int32 length = -1); }; diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index cd70ca522825..a44ea3a24915 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -26,7 +26,7 @@ using namespace ftp; extern "C" SAL_DLLPUBLIC_EXPORT void * ucpftp1_component_getFactory( - const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) + const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = nullptr; |