patch 9.0.0095: conditions are always true

zeertzjq · brammool · commit 122dea70073d · 2022-07-27T15:48:45.000+01:00
Problem:    Conditions are always true.
Solution:   Remove useless conditions. (closes #10802)
diff --git a/src/buffer.c b/src/buffer.c
@@ -4297,7 +4297,7 @@ build_stl_str_hl(
     curitem = 0;
     prevchar_isflag = TRUE;
     prevchar_isitem = FALSE;
-    for (s = usefmt; *s; )
+    for (s = usefmt; *s != NUL; )
     {
 	if (curitem == (int)stl_items_len)
 	{
@@ -4327,7 +4327,7 @@ build_stl_str_hl(
 	    stl_items_len = new_len;
 	}
 
-	if (*s != NUL && *s != '%')
+	if (*s != '%')
 	    prevchar_isflag = prevchar_isitem = FALSE;
 
 	/*
diff --git a/src/cindent.c b/src/cindent.c
@@ -2267,7 +2267,8 @@ get_c_indent(void)
 			}
 			// If the start comment string doesn't match with the
 			// start of the comment, skip this entry.  XXX
-			else if (STRNCMP(ml_get(comment_pos->lnum) + comment_pos->col,
+			else if (STRNCMP(ml_get(comment_pos->lnum)
+							    + comment_pos->col,
 					     lead_start, lead_start_len) != 0)
 			    continue;
 		    }
@@ -3717,7 +3718,7 @@ get_c_indent(void)
 	// Are we at the start of a cpp base class declaration or
 	// constructor initialization?  XXX
 	n = FALSE;
-	if (curbuf->b_ind_cpp_baseclass != 0 && theline[0] != '{')
+	if (curbuf->b_ind_cpp_baseclass != 0)
 	{
 	    n = cin_is_cpp_baseclass(&cache_cpp_baseclass);
 	    l = ml_get_curline();
diff --git a/src/version.c b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    95,
 /**/
     94,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -4297,7 +4297,7 @@ build_stl_str_hl(`
`4297`	`4297`	`curitem = 0;`
`4298`	`4298`	`prevchar_isflag = TRUE;`
`4299`	`4299`	`prevchar_isitem = FALSE;`
`4300`		`- for (s = usefmt; *s; )`
	`4300`	`+ for (s = usefmt; *s != NUL; )`
`4301`	`4301`	`{`
`4302`	`4302`	`if (curitem == (int)stl_items_len)`
`4303`	`4303`	`{`
`@@ -4327,7 +4327,7 @@ build_stl_str_hl(`
`4327`	`4327`	`stl_items_len = new_len;`
`4328`	`4328`	`}`
`4329`	`4329`
`4330`		`- if (s != NUL && s != '%')`
	`4330`	`+ if (*s != '%')`
`4331`	`4331`	`prevchar_isflag = prevchar_isitem = FALSE;`
`4332`	`4332`
`4333`	`4333`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -2267,7 +2267,8 @@ get_c_indent(void)`
`2267`	`2267`	`}`
`2268`	`2268`	`// If the start comment string doesn't match with the`
`2269`	`2269`	`// start of the comment, skip this entry. XXX`
`2270`		`- else if (STRNCMP(ml_get(comment_pos->lnum) + comment_pos->col,`
	`2270`	`+ else if (STRNCMP(ml_get(comment_pos->lnum)`
	`2271`	`+ + comment_pos->col,`
`2271`	`2272`	`lead_start, lead_start_len) != 0)`
`2272`	`2273`	`continue;`
`2273`	`2274`	`}`
`@@ -3717,7 +3718,7 @@ get_c_indent(void)`
`3717`	`3718`	`// Are we at the start of a cpp base class declaration or`
`3718`	`3719`	`// constructor initialization? XXX`
`3719`	`3720`	`n = FALSE;`
`3720`		`- if (curbuf->b_ind_cpp_baseclass != 0 && theline[0] != '{')`
	`3721`	`+ if (curbuf->b_ind_cpp_baseclass != 0)`
`3721`	`3722`	`{`
`3722`	`3723`	`n = cin_is_cpp_baseclass(&cache_cpp_baseclass);`
`3723`	`3724`	`l = ml_get_curline();`