Avoid warnings from Visual C++ code analysis with assertions and 'def…

…ault' for switches.
ScintillaOrg · Jun 2, 2022 · 55a507f · 55a507f
1 parent 22777f4
commit 55a507f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/lexlib/LexAccessor.cxx b/lexlib/LexAccessor.cxx
@@ -20,6 +20,7 @@ using namespace Lexilla;
 namespace Lexilla {
 
 bool LexAccessor::MatchIgnoreCase(Sci_Position pos, const char *s) {
+	assert(s);
 	for (; *s; s++, pos++) {
 		if (*s != MakeLowerCase(SafeGetCharAt(pos))) {
 			return false;
@@ -29,7 +30,8 @@ bool LexAccessor::MatchIgnoreCase(Sci_Position pos, const char *s) {
 }
 
 void LexAccessor::GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len) {
-	assert(startPos_ <= endPos_ && len != 0 && s != nullptr);
+	assert(s);
+	assert(startPos_ <= endPos_ && len != 0);
 	endPos_ = std::min(endPos_, startPos_ + len - 1);
 	len = endPos_ - startPos_;
 	if (startPos_ >= static_cast<Sci_PositionU>(startPos) && endPos_ <= static_cast<Sci_PositionU>(endPos)) {
@@ -42,6 +44,7 @@ void LexAccessor::GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_, char
 }
 
 void LexAccessor::GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len) {
+	assert(s);
 	GetRange(startPos_, endPos_, s, len);
 	while (*s) {
 		if (*s >= 'A' && *s <= 'Z') {

diff --git a/lexlib/LexAccessor.h b/lexlib/LexAccessor.h
@@ -69,6 +69,9 @@ class LexAccessor {
 		case 950:
 		case 1361:
 			encodingType = EncodingType::dbcs;
+			break;
+		default:
+			break;
 		}
 	}
 	char operator[](Sci_Position position) {
@@ -101,6 +104,7 @@ class LexAccessor {
 		return encodingType;
 	}
 	bool Match(Sci_Position pos, const char *s) {
+		assert(s);
 		for (int i=0; *s; i++) {
 			if (*s != SafeGetCharAt(pos+i))
 				return false;

diff --git a/lexlib/OptionSet.h b/lexlib/OptionSet.h
@@ -65,6 +65,8 @@ class OptionSet {
 					}
 					break;
 				}
+			default:
+				break;
 			}
 			return false;
 		}

diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx
@@ -8,6 +8,7 @@
 // Maintain a dictionary of properties
 
 #include <cstdlib>
+#include <cassert>
 #include <cstring>
 
 #include <string>
@@ -68,6 +69,7 @@ const char *PropSetSimple::Get(std::string_view key) const {
 
 int PropSetSimple::GetInt(std::string_view key, int defaultValue) const {
 	const char *val = Get(key);
+	assert(val);
 	if (*val) {
 		return atoi(val);
 	}

diff --git a/lexlib/WordList.cxx b/lexlib/WordList.cxx
@@ -24,6 +24,7 @@ namespace {
  * after each word.
  */
 std::unique_ptr<char *[]> ArrayFromWordList(char *wordlist, size_t slen, size_t *len, bool onlyLineEnds = false) {
+	assert(wordlist);
 	size_t words = 0;
 	// For rapid determination of whether a character is a separator, build
 	// a look up table.