From d7acb6eca77b3a40f2cfcaf692de05dd532f4bf7 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sun, 5 May 2013 11:52:33 +1000
Subject: Since new throws an exception on failure, remove testing of result.

---
 lexlib/WordList.cxx | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'lexlib')

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;
 }
 
-- 
cgit v1.2.3