diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-25 16:43:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-31 08:34:21 +0200 |
| commit | e2451bd729d0f1d795a5b689deba65bc4e9d92c6 (patch) | |
| tree | 4f2356107b0e58db7afda0fc324b9eac49ff68c0 /ucb/source/ucp/webdav | |
| parent | 460b52838fdad0352188bdd877b69cbb5f17ca63 (diff) | |
Convert indexOf->startsWith and lastIndexOf->endsWith
This is both an optimisation and a cleanup.
This converts code like
aStr.indexOf("XX") == 0
to
aStr.startsWith("XX")
and converts code like
aStr.lastIndexOf("XXX") == aStr.getLength() - 3
to
aStr.endsWith("XXX")
Note that in general
aStr.lastIndexOf("X") == aStr.getLength() - 1
converts to
aStr.isEmpty() || aStr.endsWith("X")
so I used the surrounding context to determine if aStr could be empty
when modifying the code.
Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
Diffstat (limited to 'ucb/source/ucp/webdav')
| -rw-r--r-- | ucb/source/ucp/webdav/SerfSession.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 92cd797c4838..3eb5e3cf51ec 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -351,9 +351,8 @@ namespace { sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { - nContStart = nContStart + sPartId.getLength(); - sal_Int32 nContEnd - = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); + nContStart += sPartId.getLength(); + sal_Int32 nContEnd = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); sPart = _rRawString.copy( nContStart, nContEnd - nContStart ); } return sPart; @@ -1547,7 +1546,7 @@ SerfSession::isDomainMatch( OUString certHostName ) if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; - if ( 0 == certHostName.indexOf( '*' ) && + if ( certHostName.startsWith( '*' ) && hostName.getLength() >= certHostName.getLength() ) { OUString cmpStr = certHostName.copy( 1 ); |