[Libreoffice-commits] core.git: ucb/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 23 14:13:49 UTC 2019
ucb/source/cacher/cacheserv.cxx | 2 -
ucb/source/core/ucbserv.cxx | 2 -
ucb/source/regexp/regexp.cxx | 2 -
ucb/source/sorter/sortmain.cxx | 2 -
ucb/source/ucp/cmis/cmis_provider.cxx | 2 -
ucb/source/ucp/expand/ucpexpand.cxx | 2 -
ucb/source/ucp/ext/ucpext_services.cxx | 2 -
ucb/source/ucp/file/prov.cxx | 2 -
ucb/source/ucp/ftp/ftpdirp.cxx | 44 ++++++++++++-------------
ucb/source/ucp/ftp/ftpdirp.hxx | 28 +++++++--------
ucb/source/ucp/ftp/ftpservices.cxx | 2 -
ucb/source/ucp/gio/gio_provider.cxx | 2 -
ucb/source/ucp/hierarchy/hierarchyservices.cxx | 2 -
ucb/source/ucp/package/pkgservices.cxx | 2 -
ucb/source/ucp/tdoc/tdoc_services.cxx | 2 -
ucb/source/ucp/webdav-neon/DateTimeHelper.cxx | 4 +-
ucb/source/ucp/webdav-neon/webdavservices.cxx | 2 -
ucb/source/ucp/webdav/DateTimeHelper.cxx | 4 +-
ucb/source/ucp/webdav/SerfSession.cxx | 2 -
ucb/source/ucp/webdav/webdavservices.cxx | 2 -
20 files changed, 56 insertions(+), 56 deletions(-)
New commits:
commit febb1b2861ce276ad79fccd95e9eadc9e435603c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Dec 23 11:57:05 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Dec 23 15:12:42 2019 +0100
sal_Char->char in ucb
Change-Id: Ib8b14df44da17fb0ebb12f160b66573183f7a17e
Reviewed-on: https://gerrit.libreoffice.org/85745
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 93c3f9191394..9e3d3b2a0a8b 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -29,7 +29,7 @@ using namespace com::sun::star::lang;
extern "C" SAL_DLLPUBLIC_EXPORT void * cached1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * )
+ const char * pImplName, void * pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 13e38a8a1a06..ad9003f26945 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -32,7 +32,7 @@ using namespace com::sun::star::lang;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucb_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * )
+ const char * pImplName, void * pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index a1504cb63720..4b4dc42ec947 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -234,7 +234,7 @@ OUString Regexp::getRegexp() const
namespace {
bool matchString(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
- sal_Char const * pString, size_t nStringLength)
+ char const * pString, size_t nStringLength)
{
sal_Unicode const * p = *pBegin;
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index c0d9f0508240..9d3706917e78 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -26,7 +26,7 @@ using namespace com::sun::star::lang;
extern "C" SAL_DLLPUBLIC_EXPORT void * srtrs1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * )
+ const char * pImplName, void * pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index 127cd15c4d4f..0d6a452226a4 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -139,7 +139,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * ucpcmis1_component_getFactory( const sal_Char *pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * ucpcmis1_component_getFactory( const char *pImplName,
void *pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 82d80c27674d..16bf38bbfa05 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -222,7 +222,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void * ucpexpand1_component_getFactory(
- const sal_Char * pImplName,
+ const char * pImplName,
void * pServiceManager,
void * pRegistryKey )
{
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index a326d9533a43..0d38566336ea 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -48,7 +48,7 @@ namespace ucb { namespace ucp { namespace ext
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ SAL_DLLPUBLIC_EXPORT void * ucpext_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries );
}
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 0cdbacaba61e..2829dc5604c3 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star::container;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucpfile_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * )
+ const char * pImplName, void * pServiceManager, void * )
{
void * pRet = nullptr;
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;
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 912de0e8e008..e9986207971f 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -115,7 +115,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * ucpgio1_component_getFactory( const sal_Char *pImplName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * ucpgio1_component_getFactory( const char *pImplName,
void *pServiceManager, void * )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index b4c2ab09b5d4..a8161341da8c 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -27,7 +27,7 @@ using namespace hierarchy_ucp;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucphier1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index d0e0d8930166..c6409e2ca42c 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -25,7 +25,7 @@ using namespace com::sun::star;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucppkg1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index f65ed1972649..c46751bf6d1a 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -29,7 +29,7 @@ using namespace tdoc_ucp;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucptdoc1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx
index 5765d225a563..88ca23f16ff7 100644
--- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx
@@ -152,8 +152,8 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s,
int hours;
int minutes;
int seconds;
- sal_Char string_month[3 + 1];
- sal_Char string_day[3 + 1];
+ char string_month[3 + 1];
+ char string_day[3 + 1];
sal_Int32 found = s.indexOf (',');
if (found != -1)
diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx
index f5a3116a9475..b299555359c4 100644
--- a/ucb/source/ucp/webdav-neon/webdavservices.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucpdav1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx
index 7f2a06afe912..dfa21ed5670f 100644
--- a/ucb/source/ucp/webdav/DateTimeHelper.cxx
+++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx
@@ -163,8 +163,8 @@ bool DateTimeHelper::RFC2068_To_DateTime (const OUString& s,
int hours;
int minutes;
int seconds;
- sal_Char string_month[3 + 1];
- sal_Char string_day[3 + 1];
+ char string_month[3 + 1];
+ char string_day[3 + 1];
sal_Int32 found = s.indexOf (',');
if (found != -1)
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 3eef64b9e4dd..8f7a7e38c754 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -460,7 +460,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
{
uno::Reference< security::XCertificateExtension >element = extensions[i];
- const OString aId ( reinterpret_cast<const sal_Char *>(const_cast<const signed char *>(element->getExtensionId().getArray())), element->getExtensionId().getLength());
+ const OString aId ( reinterpret_cast<const char *>(const_cast<const signed char *>(element->getExtensionId().getArray())), element->getExtensionId().getLength());
if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
{
uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY );
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 110daa90596a..419c9740d3e0 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -24,7 +24,7 @@
using namespace com::sun::star;
extern "C" SAL_DLLPUBLIC_EXPORT void * ucpdav1_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ const char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = nullptr;
More information about the Libreoffice-commits
mailing list