Use our own variant of 'assert' and 'assert_perror'.

Our variants print stack traces on failures.  This will make locating
errors much easier.

6 files changed, 13 insertions, 13 deletions

diff --git a/libcons/cons-switch.c b/libcons/cons-switch.c
index d8af50af..c46dfb46 100644
--- a/libcons/cons-switch.c
+++ b/libcons/cons-switch.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include <errno.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <pthread.h>
 
 #include "cons.h"
@@ -56,7 +56,7 @@ cons_switch (vcons_t vcons, int id, int delta, vcons_t *r_vcons)
     }
   else
     {
-      assert (delta < 0);
+      assert_backtrace (delta < 0);
       vcons_entry = vcons->vcons_entry;
       while (delta++ < 0)
         {
diff --git a/libcons/dir-changed.c b/libcons/dir-changed.c
index 8498649c..06c29701 100644
--- a/libcons/dir-changed.c
+++ b/libcons/dir-changed.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 #include <dirent.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <mach.h>
 #include <pthread.h>
 
@@ -88,14 +88,14 @@ cons_S_dir_changed (cons_notify_t notify, natural_t tickno,
 	  }
 	while (dent && !err);
 	if (err)
-	  assert ("Unexpected error");	/* XXX */
+	  assert_backtrace ("Unexpected error");	/* XXX */
       }
       break;
     case DIR_CHANGED_NEW:
       {
 	err = add_one (cons, name);
 	if (err)
-	  assert ("Unexpected error");	/* XXX */
+	  assert_backtrace ("Unexpected error");	/* XXX */
       }
       break;
     case DIR_CHANGED_UNLINK:
@@ -120,7 +120,7 @@ cons_S_dir_changed (cons_notify_t notify, natural_t tickno,
       break;
     case DIR_CHANGED_RENUMBER:
     default:
-      assert ("Unexpected dir-changed type.");
+      assert_backtrace ("Unexpected dir-changed type.");
       pthread_mutex_unlock (&cons->lock);
       return EINVAL;
     }
diff --git a/libcons/file-changed.c b/libcons/file-changed.c
index fa5cebd7..e3e35635 100644
--- a/libcons/file-changed.c
+++ b/libcons/file-changed.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include <errno.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <pthread.h>
 
 #include <mach.h>
@@ -198,7 +198,7 @@ cons_S_file_changed (cons_notify_t notify, natural_t tickno,
 		  vcons->state.screen.scr_lines
 		    = vcons->display->screen.scr_lines;
 		  if (vcons->state.screen.scr_lines < vcons->scrolling)
-		    assert (!"Implement shrinking scrollback buffer! XXX");
+		    assert_backtrace (!"Implement shrinking scrollback buffer! XXX");
 		}
 	      if (change.what.bell_audible)
 		{
diff --git a/libcons/vcons-close.c b/libcons/vcons-close.c
index 554bfa80..1a2a6024 100644
--- a/libcons/vcons-close.c
+++ b/libcons/vcons-close.c
@@ -18,7 +18,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
-#include <assert.h>
+#include <assert-backtrace.h>
 
 #include <hurd.h>
 #include <hurd/ports.h>
@@ -35,7 +35,7 @@ cons_vcons_close (vcons_t vcons)
 
   pthread_mutex_lock (&cons->lock);
   /* The same virtual console should never be opened twice.  */
-  assert (vcons_entry->vcons == vcons);
+  assert_backtrace (vcons_entry->vcons == vcons);
   vcons_entry->vcons = NULL;
   pthread_mutex_unlock (&cons->lock);
 
diff --git a/libcons/vcons-refresh.c b/libcons/vcons-refresh.c
index ce6807fe..beb36d85 100644
--- a/libcons/vcons-refresh.c
+++ b/libcons/vcons-refresh.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include <errno.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 
 #include "cons.h"
 #include "priv.h"
diff --git a/libcons/vcons-remove.c b/libcons/vcons-remove.c
index 273c5a0f..39df86a6 100644
--- a/libcons/vcons-remove.c
+++ b/libcons/vcons-remove.c
@@ -18,7 +18,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
-#include <assert.h>
+#include <assert-backtrace.h>
 
 #include "cons.h"
 
@@ -27,5 +27,5 @@
 void __attribute__ ((weak))
 cons_vcons_remove (cons_t cons, vcons_list_t vcons_entry)
 {
-  assert (!vcons_entry->vcons);
+  assert_backtrace (!vcons_entry->vcons);
 }