From e56136ce1192d04a52b01ccb41284f0b7896430e Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Sat, 16 Jan 2021 20:16:00 +0000 Subject: debug: rename assert() to xassert(), to avoid clashing with --- commands.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'commands.c') diff --git a/commands.c b/commands.c index 398f04e7..ac91ab19 100644 --- a/commands.c +++ b/commands.c @@ -19,15 +19,15 @@ cmd_scrollback_up(struct terminal *term, int rows) return; rows = min(rows, term->rows); - assert(term->grid->offset >= 0); + xassert(term->grid->offset >= 0); int new_view = term->grid->view - rows; while (new_view < 0) new_view += term->grid->num_rows; new_view %= term->grid->num_rows; - assert(new_view >= 0); - assert(new_view < term->grid->num_rows); + xassert(new_view >= 0); + xassert(new_view < term->grid->num_rows); /* Avoid scrolling in uninitialized rows */ while (term->grid->rows[new_view] == NULL) @@ -59,7 +59,7 @@ cmd_scrollback_up(struct terminal *term, int rows) #if defined(_DEBUG) for (int r = 0; r < term->rows; r++) - assert(term->grid->rows[(new_view + r) % term->grid->num_rows] != NULL); + xassert(term->grid->rows[(new_view + r) % term->grid->num_rows] != NULL); #endif LOG_DBG("scrollback UP: %d -> %d (offset = %d, end = %d, rows = %d)", @@ -99,11 +99,11 @@ cmd_scrollback_down(struct terminal *term, int rows) return; rows = min(rows, term->rows); - assert(term->grid->offset >= 0); + xassert(term->grid->offset >= 0); int new_view = (term->grid->view + rows) % term->grid->num_rows; - assert(new_view >= 0); - assert(new_view < term->grid->num_rows); + xassert(new_view >= 0); + xassert(new_view < term->grid->num_rows); /* Prevent scrolling in uninitialized rows */ bool all_initialized = false; @@ -133,7 +133,7 @@ cmd_scrollback_down(struct terminal *term, int rows) #if defined(_DEBUG) for (int r = 0; r < term->rows; r++) - assert(term->grid->rows[(new_view + r) % term->grid->num_rows] != NULL); + xassert(term->grid->rows[(new_view + r) % term->grid->num_rows] != NULL); #endif LOG_DBG("scrollback DOWN: %d -> %d (offset = %d, end = %d, rows = %d)", -- cgit v1.3