From 1ec56844387ed910b7e87bae186b58cc22cc317a Mon Sep 17 00:00:00 2001
From: Craig Barnes <craigbarnes@protonmail.com>
Date: Tue, 9 Feb 2021 13:52:33 +0000
Subject: [PATCH] Convert some uses of xassert(false) to BUG("some error
 message")

---
 config.c   |  2 +-
 fdm.c      |  2 +-
 input.c    |  2 +-
 render.c   |  5 ++---
 terminal.c | 11 +++++------
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/config.c b/config.c
index 04d563eb..56acb0cf 100644
--- a/config.c
+++ b/config.c
@@ -1230,7 +1230,7 @@ argv_compare(char *const *argv1, char *const *argv2)
             return ret;
     }
 
-    xassert(false);
+    BUG("unexpected loop break");
     return 1;
 }
 
diff --git a/fdm.c b/fdm.c
index 3394f10c..ef956450 100644
--- a/fdm.c
+++ b/fdm.c
@@ -251,7 +251,7 @@ hook_priority_to_list(struct fdm *fdm, enum fdm_hook_priority priority)
     case FDM_HOOK_PRIORITY_HIGH:   return &fdm->hooks_high;
     }
 
-    xassert(false);
+    BUG("unhandled priority type");
     return NULL;
 }
 
diff --git a/input.c b/input.c
index 79368270..ad3934b6 100644
--- a/input.c
+++ b/input.c
@@ -209,7 +209,7 @@ execute_binding(struct seat *seat, struct terminal *term,
             break;
 
         default:
-            xassert(false);
+            BUG("Unhandled action type");
             success = false;
             break;
         }
diff --git a/render.c b/render.c
index 71d54f4c..99869c2c 100644
--- a/render.c
+++ b/render.c
@@ -1367,11 +1367,10 @@ get_csd_data(const struct terminal *term, enum csd_surface surf_idx)
     case CSD_SURF_CLOSE:    return (struct csd_data){term->width - 1 * button_width, 0, button_close_width,    title_height};
 
     case CSD_SURF_COUNT:
-        xassert(false);
-        return (struct csd_data){0};
+        break;
     }
 
-    xassert(false);
+    BUG("Invalid csd_surface type");
     return (struct csd_data){0};
 }
 
diff --git a/terminal.c b/terminal.c
index 8e1e1841..c080c0c4 100644
--- a/terminal.c
+++ b/terminal.c
@@ -97,8 +97,7 @@ data_to_slave(struct terminal *term, const void *data, size_t len,
         return false;
     }
 
-    /* Shouldn't get here */
-    xassert(false);
+    BUG("Unexpected async_write() return value");
     return false;
 }
 
@@ -1931,7 +1930,7 @@ term_row_rel_to_abs(const struct terminal *term, int row)
         return min(row + term->scroll_region.start, term->scroll_region.end - 1);
     }
 
-    xassert(false);
+    BUG("Invalid cursor_origin value");
     return -1;
 }
 
@@ -2483,7 +2482,7 @@ term_mouse_down(struct terminal *term, int button, int row, int col,
 
     case MOUSE_X10:
         /* Never enabled */
-        xassert(false && "unimplemented");
+        BUG("X10 mouse mode not implemented");
         break;
     }
 }
@@ -2525,7 +2524,7 @@ term_mouse_up(struct terminal *term, int button, int row, int col,
 
     case MOUSE_X10:
         /* Never enabled */
-        xassert(false && "unimplemented");
+        BUG("X10 mouse mode not implemented");
         break;
     }
 }
@@ -2572,7 +2571,7 @@ term_mouse_motion(struct terminal *term, int button, int row, int col,
 
     case MOUSE_X10:
         /* Never enabled */
-        xassert(false && "unimplemented");
+        BUG("X10 mouse mode not implemented");
         break;
     }
 }