diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2021-02-10 09:01:51 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2021-02-10 09:01:51 +0000 |
| commit | 3c86af52c2a3e9352a88e969392575e55c3b6f74 (patch) | |
| tree | deed54e12bea0689caaad21f76f4f56b92e68d92 | |
| parent | Convert some more uses of xassert(false) to BUG("...") (diff) | |
Convert all but 2 remaining uses of xassert(false) to BUG("...")
| -rw-r--r-- | fdm.c | 8 | ||||
| -rw-r--r-- | input.c | 4 | ||||
| -rw-r--r-- | render.c | 4 | ||||
| -rw-r--r-- | selection.c | 13 |
4 files changed, 12 insertions, 17 deletions
@@ -105,16 +105,12 @@ fdm_add(struct fdm *fdm, int fd, int events, fdm_handler_t handler, void *data) #if defined(_DEBUG) int flags = fcntl(fd, F_GETFL); if (!(flags & O_NONBLOCK)) { - LOG_ERR("FD=%d is in blocking mode", fd); - xassert(false); - return false; + BUG("FD=%d is in blocking mode", fd); } tll_foreach(fdm->fds, it) { if (it->item->fd == fd) { - LOG_ERR("FD=%d already registered", fd); - xassert(false); - return false; + BUG("FD=%d already registered", fd); } } #endif @@ -1225,7 +1225,7 @@ wl_pointer_enter(void *data, struct wl_pointer *wl_pointer, break; case TERM_SURF_NONE: - xassert(false); + BUG("Invalid surface type"); break; } } @@ -1806,7 +1806,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer, } case TERM_SURF_NONE: - xassert(false); + BUG("Invalid surface type"); break; } @@ -1642,7 +1642,7 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx) break; default: - xassert(false); + BUG("unhandled surface type: %u", (unsigned)surf_idx); break; } @@ -1878,7 +1878,7 @@ render_scrollback_position(struct terminal *term) int surf_top = 0; switch (term->conf->scrollback.indicator.position) { case SCROLLBACK_INDICATOR_POSITION_NONE: - xassert(false); + BUG("Invalid scrollback indicator position type"); return; case SCROLLBACK_INDICATOR_POSITION_FIXED: diff --git a/selection.c b/selection.c index 90c6c392..cb625541 100644 --- a/selection.c +++ b/selection.c @@ -195,11 +195,10 @@ foreach_selected( return; case SELECTION_NONE: - xassert(false); - return; + break; } - xassert(false); + BUG("Invalid selection kind"); } static bool @@ -426,7 +425,7 @@ selection_start(struct terminal *term, int col, int row, break; case SELECTION_NONE: - xassert(false); + BUG("Invalid selection kind"); break; } @@ -728,7 +727,7 @@ selection_update(struct terminal *term, int col, int row) break; case SELECTION_NONE: - xassert(false); + BUG("Invalid selection kind"); break; } @@ -861,7 +860,7 @@ selection_extend_normal(struct terminal *term, int col, int row, case SELECTION_BLOCK: case SELECTION_NONE: - xassert(false); + BUG("Invalid selection kind in this context"); break; } @@ -963,7 +962,7 @@ selection_extend(struct seat *seat, struct terminal *term, switch (term->selection.kind) { case SELECTION_NONE: - xassert(false); + BUG("Invalid selection kind"); return; case SELECTION_CHAR_WISE: |
