patch 9.2.0296: Redundant and incorrect integer pointer casts in drawline.c

zeertzjq · chrisbra · commit 18cd55dbc4b9 · 2026-04-04T08:55:59.000Z
Problem: Currently `colnr_T` and `int` and the same type, so casting `int *` to `colnr_T *` is redundant. Additionally, even if they are changed to different types in the future, these casts are incorrect as they won't work on big-endian platforms. Solution: Remove the casts. Also fix two cases of passing false instead of 0 to an integer argument (zeertzjq). related: #19672 closes: #19907 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/drawline.c b/src/drawline.c
@@ -1418,8 +1418,7 @@ win_line(
 			wlv.fromcol = 0;
 		    else
 		    {
-			getvvcol(wp, top, (colnr_T *)&wlv.fromcol,
-								NULL, NULL, 0);
+			getvvcol(wp, top, &wlv.fromcol, NULL, NULL, 0);
 			if (gchar_pos(top) == NUL)
 			    wlv.tocol = wlv.fromcol + 1;
 		    }
@@ -1437,12 +1436,10 @@ win_line(
 		    {
 			pos = *bot;
 			if (*p_sel == 'e')
-			    getvvcol(wp, &pos, (colnr_T *)&wlv.tocol,
-								NULL, NULL, 0);
+			    getvvcol(wp, &pos, &wlv.tocol, NULL, NULL, 0);
 			else
 			{
-			    getvvcol(wp, &pos, NULL, NULL,
-						     (colnr_T *)&wlv.tocol, 0);
+			    getvvcol(wp, &pos, NULL, NULL, &wlv.tocol, 0);
 			    ++wlv.tocol;
 			}
 		    }
@@ -1481,14 +1478,14 @@ win_line(
 	{
 	    if (lnum == curwin->w_cursor.lnum)
 		getvcol(curwin, &(curwin->w_cursor),
-				       (colnr_T *)&wlv.fromcol, NULL, NULL, 0);
+						&wlv.fromcol, NULL, NULL, 0);
 	    else
 		wlv.fromcol = 0;
 	    if (lnum == curwin->w_cursor.lnum + search_match_lines)
 	    {
 		pos.lnum = lnum;
 		pos.col = search_match_endcol;
-		getvcol(curwin, &pos, (colnr_T *)&wlv.tocol, NULL, NULL, 0);
+		getvcol(curwin, &pos, &wlv.tocol, NULL, NULL, 0);
 	    }
 	    else
 		wlv.tocol = MAXCOL;
diff --git a/src/ops.c b/src/ops.c
@@ -2620,7 +2620,7 @@ charwise_block_prep(
 	startcol = start.col;
 	if (virtual_op)
 	{
-	    getvcol(curwin, &start, &cs, NULL, &ce, false);
+	    getvcol(curwin, &start, &cs, NULL, &ce, 0);
 	    if (ce != cs && start.coladd > 0)
 	    {
 		// Part of a tab selected -- but don't
@@ -2639,7 +2639,7 @@ charwise_block_prep(
 	endcol = end.col;
 	if (virtual_op)
 	{
-	    getvcol(curwin, &end, &cs, NULL, &ce, false);
+	    getvcol(curwin, &end, &cs, NULL, &ce, 0);
 	    if (p[endcol] == NUL || (cs + end.coladd < ce
 			// Don't add space for double-wide
 			// char; endcol will be on last byte
diff --git a/src/version.c b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    296,
 /**/
     295,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -1418,8 +1418,7 @@ win_line(`
`1418`	`1418`	`wlv.fromcol = 0;`
`1419`	`1419`	`else`
`1420`	`1420`	`{`
`1421`		`- getvvcol(wp, top, (colnr_T *)&wlv.fromcol,`
`1422`		`- NULL, NULL, 0);`
	`1421`	`+ getvvcol(wp, top, &wlv.fromcol, NULL, NULL, 0);`
`1423`	`1422`	`if (gchar_pos(top) == NUL)`
`1424`	`1423`	`wlv.tocol = wlv.fromcol + 1;`
`1425`	`1424`	`}`
`@@ -1437,12 +1436,10 @@ win_line(`
`1437`	`1436`	`{`
`1438`	`1437`	`pos = *bot;`
`1439`	`1438`	`if (*p_sel == 'e')`
`1440`		`- getvvcol(wp, &pos, (colnr_T *)&wlv.tocol,`
`1441`		`- NULL, NULL, 0);`
	`1439`	`+ getvvcol(wp, &pos, &wlv.tocol, NULL, NULL, 0);`
`1442`	`1440`	`else`
`1443`	`1441`	`{`
`1444`		`- getvvcol(wp, &pos, NULL, NULL,`
`1445`		`- (colnr_T *)&wlv.tocol, 0);`
	`1442`	`+ getvvcol(wp, &pos, NULL, NULL, &wlv.tocol, 0);`
`1446`	`1443`	`++wlv.tocol;`
`1447`	`1444`	`}`
`1448`	`1445`	`}`
`@@ -1481,14 +1478,14 @@ win_line(`
`1481`	`1478`	`{`
`1482`	`1479`	`if (lnum == curwin->w_cursor.lnum)`
`1483`	`1480`	`getvcol(curwin, &(curwin->w_cursor),`
`1484`		`- (colnr_T *)&wlv.fromcol, NULL, NULL, 0);`
	`1481`	`+ &wlv.fromcol, NULL, NULL, 0);`
`1485`	`1482`	`else`
`1486`	`1483`	`wlv.fromcol = 0;`
`1487`	`1484`	`if (lnum == curwin->w_cursor.lnum + search_match_lines)`
`1488`	`1485`	`{`
`1489`	`1486`	`pos.lnum = lnum;`
`1490`	`1487`	`pos.col = search_match_endcol;`
`1491`		`- getvcol(curwin, &pos, (colnr_T *)&wlv.tocol, NULL, NULL, 0);`
	`1488`	`+ getvcol(curwin, &pos, &wlv.tocol, NULL, NULL, 0);`
`1492`	`1489`	`}`
`1493`	`1490`	`else`
`1494`	`1491`	`wlv.tocol = MAXCOL;`
Original file line number	Diff line number	Diff line change
`@@ -2620,7 +2620,7 @@ charwise_block_prep(`
`2620`	`2620`	`startcol = start.col;`
`2621`	`2621`	`if (virtual_op)`
`2622`	`2622`	`{`
`2623`		`- getvcol(curwin, &start, &cs, NULL, &ce, false);`
	`2623`	`+ getvcol(curwin, &start, &cs, NULL, &ce, 0);`
`2624`	`2624`	`if (ce != cs && start.coladd > 0)`
`2625`	`2625`	`{`
`2626`	`2626`	`// Part of a tab selected -- but don't`
`@@ -2639,7 +2639,7 @@ charwise_block_prep(`
`2639`	`2639`	`endcol = end.col;`
`2640`	`2640`	`if (virtual_op)`
`2641`	`2641`	`{`
`2642`		`- getvcol(curwin, &end, &cs, NULL, &ce, false);`
	`2642`	`+ getvcol(curwin, &end, &cs, NULL, &ce, 0);`
`2643`	`2643`	`if (p[endcol] == NUL \|\| (cs + end.coladd < ce`
`2644`	`2644`	`// Don't add space for double-wide`
`2645`	`2645`	`// char; endcol will be on last byte`