sal/rtl/string.cxx | 15 ++++++++++-----
sal/rtl/strtmpl.hxx | 52 ----------------------------------------------------
sal/rtl/ustring.cxx | 15 ++++++++++-----
3 files changed, 20 insertions(+), 62 deletions(-)
New commits:
commit 8ae8bea13565012410ecf13332f4696346294c12
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Mar 2 10:11:23 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Mar 2 08:54:56 2022 +0100
Drop useless indirection and unused template
Change-Id: Icbcf56c30c9d901a4436f56a1648a7c8e7504848
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130817
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index 87c65f6069ce..c5d535075354 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -506,28 +506,33 @@ sal_Bool SAL_CALL rtl_str_toBoolean(const char* pStr)
SAL_THROW_EXTERN_C()
sal_Int32 SAL_CALL rtl_str_toInt32(const char* pStr, sal_Int16 nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toInt32(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_Int32>(pStr, nRadix);
}
sal_Int64 SAL_CALL rtl_str_toInt64(const char* pStr, sal_Int16 nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toInt64(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_Int64>(pStr, nRadix);
}
sal_Int64 SAL_CALL rtl_str_toInt64_WithLength(const char* pStr, sal_Int16
nRadix,
sal_Int32 nStrLength)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toInt64_WithLength(pStr, nRadix, nStrLength);
+ assert(pStr || nStrLength == 0);
+ return rtl::str::toInt<sal_Int64>(std::basic_string_view(pStr,
nStrLength), nRadix);
}
sal_uInt32 SAL_CALL rtl_str_toUInt32(const char* pStr, sal_Int16 nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toUInt32(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_uInt32>(pStr, nRadix);
}
sal_uInt64 SAL_CALL rtl_str_toUInt64(const char* pStr, sal_Int16 nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toUInt64(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_uInt64>(pStr, nRadix);
}
rtl_String* rtl_string_ImplAlloc(sal_Int32 nLen) { return
rtl::str::Alloc<rtl_String>(nLen); }
diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index a6b06ad0256e..6988865e8f11 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -834,58 +834,6 @@ template <typename T, class S> T toInt(S str, sal_Int16
nRadix)
return static_cast<T>(n);
}
-template <typename IMPL_RTL_STRCODE>
-sal_Int32 toInt32 ( const IMPL_RTL_STRCODE* pStr,
- sal_Int16 nRadix )
-{
- assert(pStr);
- return toInt<sal_Int32>(pStr, nRadix);
-}
-
-template <typename IMPL_RTL_STRCODE>
-sal_Int32 toInt32_WithLength ( const IMPL_RTL_STRCODE* pStr,
- sal_Int16 nRadix,
- sal_Int32 nStrLength)
-
-{
- assert(pStr);
- return toInt<sal_Int32>(std::basic_string_view(pStr, nStrLength), nRadix);
-}
-
-template <typename IMPL_RTL_STRCODE>
-sal_Int64 toInt64 ( const IMPL_RTL_STRCODE* pStr,
- sal_Int16 nRadix )
-{
- assert(pStr);
- return toInt<sal_Int64>(pStr, nRadix);
-}
-
-template <typename IMPL_RTL_STRCODE>
-sal_Int64 toInt64_WithLength ( const IMPL_RTL_STRCODE* pStr,
- sal_Int16 nRadix,
- sal_Int32 nStrLength)
-
-{
- assert(pStr);
- return toInt<sal_Int64>(std::basic_string_view(pStr, nStrLength), nRadix);
-}
-
-template <typename IMPL_RTL_STRCODE>
-sal_uInt32 toUInt32 ( const IMPL_RTL_STRCODE* pStr,
- sal_Int16 nRadix )
-{
- assert(pStr);
- return toInt<sal_uInt32>(pStr, nRadix);
-}
-
-template <typename IMPL_RTL_STRCODE>
-sal_uInt64 toUInt64 ( const IMPL_RTL_STRCODE* pStr,
- sal_Int16 nRadix )
-{
- assert(pStr);
- return toInt<sal_uInt64>(pStr, nRadix);
-}
-
/* ======================================================================= */
/* Internal String-Class help functions */
/* ======================================================================= */
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 62157a6bafca..4451866e4588 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -1171,30 +1171,35 @@ sal_Bool SAL_CALL rtl_ustr_toBoolean(const sal_Unicode*
pStr) SAL_THROW_EXTERN_C
sal_Int32 SAL_CALL rtl_ustr_toInt32(const sal_Unicode* pStr, sal_Int16 nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toInt32(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_Int32>(pStr, nRadix);
}
sal_Int64 SAL_CALL rtl_ustr_toInt64(const sal_Unicode* pStr, sal_Int16 nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toInt64(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_Int64>(pStr, nRadix);
}
sal_Int64 SAL_CALL rtl_ustr_toInt64_WithLength(const sal_Unicode* pStr,
sal_Int16 nRadix,
sal_Int32 nStrLength)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toInt64_WithLength(pStr, nRadix, nStrLength);
+ assert(pStr || nStrLength == 0);
+ return rtl::str::toInt<sal_Int64>(std::basic_string_view(pStr,
nStrLength), nRadix);
}
sal_uInt32 SAL_CALL rtl_ustr_toUInt32(const sal_Unicode* pStr, sal_Int16
nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toUInt32(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_uInt32>(pStr, nRadix);
}
sal_uInt64 SAL_CALL rtl_ustr_toUInt64(const sal_Unicode* pStr, sal_Int16
nRadix)
SAL_THROW_EXTERN_C()
{
- return rtl::str::toUInt64(pStr, nRadix);
+ assert(pStr);
+ return rtl::str::toInt<sal_uInt64>(pStr, nRadix);
}
rtl_uString* rtl_uString_ImplAlloc(sal_Int32 nLen)
