diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-01-21 15:01:08 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-01-21 15:01:08 +1100 |
| commit | 5af7d68fe759e093e73f6bbff2125d7707ae1d1b (patch) | |
| tree | f8cb4ac967a62d7e394151b6ca8c14d61766cf0b | |
| parent | 6ec0dfa29f77ac7b7719208788cf8c041fd59674 (diff) | |
| download | scintilla-mirror-5af7d68fe759e093e73f6bbff2125d7707ae1d1b.tar.gz | |
Using ELEMENTS for clarity and safety.
| -rw-r--r-- | win32/ScintillaWin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 2f11a0cc2..c8cf7c63e 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1472,7 +1472,7 @@ public: wchar_t wFolded[20]; unsigned int charsConverted = UTF16FromUTF8(foldedUTF8, static_cast<unsigned int>(strlen(foldedUTF8)), - wFolded, sizeof(wFolded)/sizeof(wFolded[0])); + wFolded, ELEMENTS(wFolded)); for (size_t j=0; j<charsConverted; j++) utf16Folded[lenFlat++] = wFolded[j]; } else { @@ -1511,19 +1511,19 @@ CaseFolder *ScintillaWin::CaseFolderForEncoding() { sCharacter[0] = static_cast<char>(i); wchar_t wCharacter[20]; unsigned int lengthUTF16 = ::MultiByteToWideChar(cpDoc, 0, sCharacter, 1, - wCharacter, sizeof(wCharacter)/sizeof(wCharacter[0])); + wCharacter, ELEMENTS(wCharacter)); if (lengthUTF16 == 1) { const char *caseFolded = CaseConvert(wCharacter[0], CaseConversionFold); if (caseFolded) { wchar_t wLower[20]; unsigned int charsConverted = UTF16FromUTF8(caseFolded, static_cast<unsigned int>(strlen(caseFolded)), - wLower, sizeof(wLower)/sizeof(wLower[0])); + wLower, ELEMENTS(wLower)); if (charsConverted == 1) { char sCharacterLowered[20]; unsigned int lengthConverted = ::WideCharToMultiByte(cpDoc, 0, wLower, charsConverted, - sCharacterLowered, sizeof(sCharacterLowered), NULL, 0); + sCharacterLowered, ELEMENTS(sCharacterLowered), NULL, 0); if ((lengthConverted == 1) && (sCharacter[0] != sCharacterLowered[0])) { pcf->SetTranslation(sCharacter[0], sCharacterLowered[0]); } |