[Libreoffice-commits] core.git: sal/rtl

[Mike Kaganski (via logerrit)]

 sal/rtl/ustring.cxx |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 72f836fb0c0c3daaf0e47832809a352888577905
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Feb 25 17:24:37 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Feb 25 16:31:18 2022 +0100

    Don't invent another strlen
    
    Change-Id: I7f7b7029ac03b1f06f4d9c2612b9b008b033baea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130538
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index fb7d45e3ebbd..aa3a7263d1b7 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -375,17 +375,7 @@ void SAL_CALL rtl_uString_newFromAscii( rtl_uString** 
ppThis,
     SAL_THROW_EXTERN_C()
 {
     assert(ppThis);
-    sal_Int32 nLen;
-
-    if ( pCharStr )
-    {
-        const char* pTempStr = pCharStr;
-        while( *pTempStr )
-            pTempStr++;
-        nLen = pTempStr-pCharStr;
-    }
-    else
-        nLen = 0;
+    sal_Int32 nLen = pCharStr ? rtl::str::getLength(pCharStr) : 0;
 
     if ( !nLen )
     {