summaryrefslogtreecommitdiff
path: root/sal/rtl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/math.cxx22
-rw-r--r--sal/rtl/strbuf.cxx14
-rw-r--r--sal/rtl/string.cxx20
-rw-r--r--sal/rtl/strtmpl.cxx20
-rw-r--r--sal/rtl/uri.cxx2
-rw-r--r--sal/rtl/ustrbuf.cxx2
-rw-r--r--sal/rtl/ustring.cxx36
7 files changed, 58 insertions, 58 deletions
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,
generated by cgit (git 2.34.1) at 2024-12-26 00:54:05 +0000