Remove unreachable assert

Ristellise · Jun 2, 2020 · 0847c17 · 0847c17
1 parent 7bbba90
commit 0847c17
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/libaegisub/common/util.cpp b/libaegisub/common/util.cpp
@@ -184,7 +184,6 @@ void tagless_find_helper::map_range(size_t &s, size_t &e) {
 			continue;
 		}
 
-		assert(block.first > s);
 		// Blocks after the match are irrelevant
 		if (block.first >= e) break;
 

diff --git a/src/audio_renderer_spectrum.cpp b/src/audio_renderer_spectrum.cpp
@@ -219,7 +219,6 @@ void AudioSpectrumRenderer::Render(wxBitmap &bmp, int start, AudioRenderingStyle
 	int end = start + bmp.GetWidth();
 
 	assert(start >= 0);
-	assert(end >= 0);
 	assert(end >= start);
 
 	// Prepare an image buffer to write

diff --git a/src/auto4_lua_assfile.cpp b/src/auto4_lua_assfile.cpp
@@ -376,7 +376,6 @@ namespace Automation4 {
 				return error(L, "Attempt to index a Subtitle File object with value of type '%s'.", lua_typename(L, lua_type(L, 2)));
 		}
 
-		assert(false);
 		return 0;
 	}
 

diff --git a/src/command/edit.cpp b/src/command/edit.cpp
@@ -246,7 +246,8 @@ struct parsed_line {
 			shift += 2;
 			blocks = line->ParseTags();
 		}
-		else if (ovr) {
+		else {
+			// We've reached here, ovr cannot be null
 			std::string alt;
 			if (tag == "\\c") alt = "\\1c";
 			// Remove old of same
@@ -270,8 +271,6 @@ struct parsed_line {
 
 			line->UpdateText(blocks);
 		}
-		else
-			assert(false);
 
 		return shift;
 	}