diff options
author | nyamatongwe <devnull@localhost> | 2013-05-05 11:52:33 +1000 |
---|---|---|
committer | nyamatongwe <devnull@localhost> | 2013-05-05 11:52:33 +1000 |
commit | 46f28c2d01bd405725df6e06d0eeb543bb9092f8 (patch) | |
tree | 623c7c1d96743351a979f0101943474730545ecb /lexlib/WordList.cxx | |
parent | 1cc7b583576574d94e038692608f73df96964485 (diff) | |
download | scintilla-mirror-46f28c2d01bd405725df6e06d0eeb543bb9092f8.tar.gz |
Since new throws an exception on failure, remove testing of result.
Diffstat (limited to 'lexlib/WordList.cxx')
-rw-r--r-- | lexlib/WordList.cxx | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/lexlib/WordList.cxx b/lexlib/WordList.cxx index 9c2c9653b..07ca015e3 100644 --- a/lexlib/WordList.cxx +++ b/lexlib/WordList.cxx @@ -45,26 +45,22 @@ static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = fa prev = curr; } char **keywords = new char *[words + 1]; - if (keywords) { - words = 0; - prev = '\0'; - size_t slen = strlen(wordlist); - for (size_t k = 0; k < slen; k++) { - if (!wordSeparator[static_cast<unsigned char>(wordlist[k])]) { - if (!prev) { - keywords[words] = &wordlist[k]; - words++; - } - } else { - wordlist[k] = '\0'; + words = 0; + prev = '\0'; + size_t slen = strlen(wordlist); + for (size_t k = 0; k < slen; k++) { + if (!wordSeparator[static_cast<unsigned char>(wordlist[k])]) { + if (!prev) { + keywords[words] = &wordlist[k]; + words++; } - prev = wordlist[k]; + } else { + wordlist[k] = '\0'; } - keywords[words] = &wordlist[slen]; - *len = words; - } else { - *len = 0; + prev = wordlist[k]; } + keywords[words] = &wordlist[slen]; + *len = words; return keywords; } |