mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce OUString operations and use indexed getToken

Browse Source 
Change-Id: I41bc361cbbbf1a446138354eb7bf80729a79bc1f
Reviewed-on: https://gerrit.libreoffice.org/65673
Tested-by: Jenkins
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
This commit is contained in:
Matteo Casalin
2018-12-21 18:23:34 +01:00
parent 83e7d9e084
commit da096e3b0a
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cpputools/source/unoexe/unoexe.cxx
View File

@@ -427,16 +427,24 @@ SAL_IMPLEMENT_MAIN()
if (!aUnoUrl.isEmpty()) // accepting connections if (!aUnoUrl.isEmpty()) // accepting connections
{ {
sal_Int32 nIndex = 0, nTokens = 0; if (aUnoUrl.getLength() < 10 || !aUnoUrl.startsWithIgnoreAsciiCase( "uno:" ))
do { aUnoUrl.getToken( 0, ';', nIndex ); nTokens++; } while( nIndex != -1 ); {
if (nTokens != 3 || aUnoUrl.getLength() < 10 || throw RuntimeException("illegal uno url given!" );
!aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( "uno:" )) }
sal_Int32 nIndex = 4; // skip initial "uno:"
bool bTooFewTokens {false};
const OUString aConnectDescr{ aUnoUrl.getToken( 0, ';', nIndex ) }; // uno:CONNECTDESCR;iiop;InstanceName
if (nIndex<0) bTooFewTokens = true;
const OUString aUnoUrlToken{ aUnoUrl.getToken( 0, ';', nIndex ) };
if (nIndex<0) bTooFewTokens = true;
const OUString aInstanceName{ aUnoUrl.getToken( 0, ';', nIndex ) };
// Exactly 3 tokens are required
if (bTooFewTokens || nIndex>0)
{ {
throw RuntimeException("illegal uno url given!" ); throw RuntimeException("illegal uno url given!" );
} }
nIndex = 0;
OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName
OUString aInstanceName( aUnoUrl.getToken( 1, ';', nIndex ) );
Reference< XAcceptor > xAcceptor = Acceptor::create(xContext); Reference< XAcceptor > xAcceptor = Acceptor::create(xContext);
@@ -454,8 +462,6 @@ SAL_IMPLEMENT_MAIN()
xContext, aImplName, aLocation, aServiceName, aInitParams, xContext, aImplName, aLocation, aServiceName, aInitParams,
bSingleInstance, aInstanceName ) ); bSingleInstance, aInstanceName ) );
nIndex = 0;
OUString aUnoUrlToken( aUnoUrl.getToken( 1, ';', nIndex ) );
// coverity[loop_top] - not really an infinite loop, we can be instructed to exit via the connection // coverity[loop_top] - not really an infinite loop, we can be instructed to exit via the connection
for (;;) for (;;)
{ {