fix(PVS/V583): the '?:' operator always returns one and the same value (#17790)

dundargoc · web-flow · commit e9b53f3fb56e · 2022-03-20T17:25:03.000-06:00
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -1082,7 +1082,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
       }
     }
   } else {
-    hsep_height = global_stl_height() > 0 ? 1 : STATUS_HEIGHT;
+    hsep_height = STATUS_HEIGHT;
     layout = FR_COL;
 
     /*
@@ -1374,8 +1374,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
       }
       frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, false);
     } else {
-      win_new_height(oldwin, oldwin_height - (new_size
-                                              + (global_stl_height() > 0 ? 1 : STATUS_HEIGHT)));
+      win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT));
     }
 
     if (before) {       // new window above current one
@@ -1643,7 +1642,7 @@ int make_windows(int count, bool vertical)
     // Each window needs at least 'winminheight' lines
     // If statusline isn't global, each window also needs a statusline
     maxcount = (curwin->w_height + curwin->w_hsep_height + curwin->w_status_height
-                - (p_wh - p_wmh)) / (p_wmh + (global_stl_height() > 0 ? 1 : STATUS_HEIGHT));
+                - (p_wh - p_wmh)) / (p_wmh + STATUS_HEIGHT);
   }
 
   if (maxcount < 2) {
@@ -2166,7 +2165,7 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
       totwincount -= wincount;
     }
   } else {  // topfr->fr_layout == FR_COL
-    hsep_height = global_stl_height() > 0 ? 1 : STATUS_HEIGHT;
+    hsep_height = STATUS_HEIGHT;
     topfr->fr_width = width;
     topfr->fr_height = height;
 

Original file line number	Diff line number	Diff line change
`@@ -1082,7 +1082,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)`
`1082`	`1082`	`}`
`1083`	`1083`	`}`
`1084`	`1084`	`} else {`
`1085`		`- hsep_height = global_stl_height() > 0 ? 1 : STATUS_HEIGHT;`
	`1085`	`+ hsep_height = STATUS_HEIGHT;`
`1086`	`1086`	`layout = FR_COL;`
`1087`	`1087`
`1088`	`1088`	`/*`
`@@ -1374,8 +1374,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)`
`1374`	`1374`	`}`
`1375`	`1375`	`frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, false);`
`1376`	`1376`	`} else {`
`1377`		`- win_new_height(oldwin, oldwin_height - (new_size`
`1378`		`- + (global_stl_height() > 0 ? 1 : STATUS_HEIGHT)));`
	`1377`	`+ win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT));`
`1379`	`1378`	`}`
`1380`	`1379`
`1381`	`1380`	`if (before) { // new window above current one`
`@@ -1643,7 +1642,7 @@ int make_windows(int count, bool vertical)`
`1643`	`1642`	`// Each window needs at least 'winminheight' lines`
`1644`	`1643`	`// If statusline isn't global, each window also needs a statusline`
`1645`	`1644`	`maxcount = (curwin->w_height + curwin->w_hsep_height + curwin->w_status_height`
`1646`		`- - (p_wh - p_wmh)) / (p_wmh + (global_stl_height() > 0 ? 1 : STATUS_HEIGHT));`
	`1645`	`+ - (p_wh - p_wmh)) / (p_wmh + STATUS_HEIGHT);`
`1647`	`1646`	`}`
`1648`	`1647`
`1649`	`1648`	`if (maxcount < 2) {`
`@@ -2166,7 +2165,7 @@ static void win_equal_rec(win_T next_curwin, bool current, frame_T topfr, int`
`2166`	`2165`	`totwincount -= wincount;`
`2167`	`2166`	`}`
`2168`	`2167`	`} else { // topfr->fr_layout == FR_COL`
`2169`		`- hsep_height = global_stl_height() > 0 ? 1 : STATUS_HEIGHT;`
	`2168`	`+ hsep_height = STATUS_HEIGHT;`
`2170`	`2169`	`topfr->fr_width = width;`
`2171`	`2170`	`topfr->fr_height = height;`
`2172`	`2171`