diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2013-04-07 15:54:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-10 10:43:38 +0200 |
| commit | 4976dd85fa6ecc279ac80d86a27636ce64d3a3ac (patch) | |
| tree | ec4a2416ca13803d7643953ab36522bf6694c7e5 /sal/rtl/uri.cxx | |
| parent | 5d67919a5810cf05d6fe53dc14f2b1f073c56719 (diff) | |
Introduce characters utilities in rtl/character.hxx
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, with slight modifications
to sal/inc/rtl/character.hxx:
* Replaced "#pragma once" with explicit include guard for now.
* Missing includes.
* Cosmetic clean-up.
Change-Id: I94d01cd4e766f92c70f941839a67101fa2c97654
Diffstat (limited to 'sal/rtl/uri.cxx')
| -rw-r--r-- | sal/rtl/uri.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx index 9edd087ca335..7e4402f785c8 100644 --- a/sal/rtl/uri.cxx +++ b/sal/rtl/uri.cxx @@ -20,6 +20,7 @@ #include "surrogates.hxx" #include "osl/diagnose.h" +#include "rtl/character.hxx" #include "rtl/strbuf.hxx" #include "rtl/textenc.h" #include "rtl/textcvt.h" @@ -39,20 +40,6 @@ std::size_t const nCharClassSize = 128; sal_Unicode const cEscapePrefix = 0x25; // '%' -inline bool isDigit(sal_uInt32 nUtf32) -{ - return nUtf32 >= 0x30 && nUtf32 <= 0x39; // '0'--'9' -} - -inline bool isAlpha(sal_uInt32 nUtf32) -{ - // 'A'--'Z', 'a'--'z' - return ( - (nUtf32 >= 0x41 && nUtf32 <= 0x5A) || - (nUtf32 >= 0x61 && nUtf32 <= 0x7A) - ); -} - inline bool isHighSurrogate(sal_uInt32 nUtf16) { return SAL_RTL_IS_HIGH_SURROGATE(nUtf16); @@ -376,7 +363,7 @@ void parseUriRef(rtl_uString const * pUriRef, Components * pComponents) sal_Unicode const * pEnd = pBegin + pUriRef->length; sal_Unicode const * pPos = pBegin; - if (pPos != pEnd && isAlpha(*pPos)) + if (pPos != pEnd && rtl::isAsciiAlpha(*pPos)) { for (sal_Unicode const * p = pPos + 1; p != pEnd; ++p) { @@ -387,7 +374,7 @@ void parseUriRef(rtl_uString const * pUriRef, Components * pComponents) pPos = p; break; } - else if (!isAlpha(*p) && !isDigit(*p) && *p != '+' && *p != '-' + else if (!rtl::isAsciiAlphanumeric(*p) && *p != '+' && *p != '-' && *p != '.') { break; |