patch 8.2.3636: Coverity warns for unreachable code

brammool · brammool · commit 2c23670300b1 · 2021-11-21T11:15:49.000Z
Problem:    Coverity warns for unreachable code.
Solution:   Remove unreachable else block.
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
@@ -5604,7 +5604,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
 		{
 		    slen++; // ligature char by char
 		}
-		else if (is_utf8)
+		else // is_utf8
 		{
 		    if ((*(cs + slen) & 0xC0) == 0x80)
 		    {
@@ -5638,10 +5638,6 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
 			slen++;
 		    }
 		}
-		else
-		{
-		    slen++;
-		}
 	    }
 	    else
 	    {
diff --git a/src/version.c b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3636,
 /**/
     3635,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -5604,7 +5604,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)`
`5604`	`5604`	`{`
`5605`	`5605`	`slen++; // ligature char by char`
`5606`	`5606`	`}`
`5607`		`- else if (is_utf8)`
	`5607`	`+ else // is_utf8`
`5608`	`5608`	`{`
`5609`	`5609`	`if ((*(cs + slen) & 0xC0) == 0x80)`
`5610`	`5610`	`{`
`@@ -5638,10 +5638,6 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)`
`5638`	`5638`	`slen++;`
`5639`	`5639`	`}`
`5640`	`5640`	`}`
`5641`		`- else`
`5642`		`- {`
`5643`		`- slen++;`
`5644`		`- }`
`5645`	`5641`	`}`
`5646`	`5642`	`else`
`5647`	`5643`	`{`