UGRID_FOREACH_CELL: avoid shadowed variables

This commit is contained in:
Justin M. Keyes 2019-01-02 12:58:11 +01:00
parent a70fde1b45
commit 7ede14d191
2 changed files with 4 additions and 4 deletions

View File

@ -1174,7 +1174,7 @@ static void tui_flush(UI *ui)
}
UGRID_FOREACH_CELL(grid, row, r.left, clear_col, {
cursor_goto(ui, row, col);
cursor_goto(ui, row, curcol);
print_cell(ui, cell);
});
if (clear_col < r.right) {
@ -1283,7 +1283,7 @@ static void tui_raw_line(UI *ui, Integer g, Integer linerow, Integer startcol,
grid->cells[linerow][c].attr = attrs[c-startcol];
}
UGRID_FOREACH_CELL(grid, (int)linerow, (int)startcol, (int)endcol, {
cursor_goto(ui, (int)linerow, col);
cursor_goto(ui, (int)linerow, curcol);
print_cell(ui, cell);
});

View File

@ -25,8 +25,8 @@ struct ugrid {
#define UGRID_FOREACH_CELL(grid, row, startcol, endcol, code) \
do { \
UCell *row_cells = (grid)->cells[row]; \
for (int col = startcol; col < endcol; col++) { \
UCell *cell = row_cells + col; \
for (int curcol = startcol; curcol < endcol; curcol++) { \
UCell *cell = row_cells + curcol; \
(void)(cell); \
code; \
} \