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, 21 insertions, 21 deletions

diff --git a/term/devio.c b/term/devio.c
index eedd7b87..60ee2217 100644
--- a/term/devio.c
+++ b/term/devio.c
@@ -43,7 +43,7 @@
 #undef EXTA
 #undef EXTB
 
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <errno.h>
 #include <error.h>
 #include <string.h>
@@ -459,15 +459,15 @@ initial_open ()
 {
   error_t err;
 
-  assert (open_pending != FAKE);
+  assert_backtrace (open_pending != FAKE);
 
   /* Nothing to do */
   if (open_pending == INITIAL)
     return 0;
 
-  assert (phys_device == MACH_PORT_NULL);
-  assert (phys_reply == MACH_PORT_NULL);
-  assert (phys_reply_pi == 0);
+  assert_backtrace (phys_device == MACH_PORT_NULL);
+  assert_backtrace (phys_reply == MACH_PORT_NULL);
+  assert_backtrace (phys_reply_pi == 0);
 
   err = ports_create_port (phys_reply_class, term_bucket,
 			   sizeof (struct port_info), &phys_reply_pi);
@@ -516,7 +516,7 @@ devio_assert_dtr ()
 
   /* Schedule a fake open to wait for DTR, unless one is already
      happening. */
-  assert (open_pending != INITIAL);
+  assert_backtrace (open_pending != INITIAL);
   if (open_pending == FAKE)
     return 0;
 
@@ -544,7 +544,7 @@ device_open_reply (mach_port_t replyport,
 
   pthread_mutex_lock (&global_lock);
 
-  assert (open_pending != NOTPENDING);
+  assert_backtrace (open_pending != NOTPENDING);
 
   if (returncode != 0)
     {
@@ -564,9 +564,9 @@ device_open_reply (mach_port_t replyport,
     {
       /* Special handling for the first open */
 
-      assert (phys_device == MACH_PORT_NULL);
-      assert (phys_reply_writes == MACH_PORT_NULL);
-      assert (phys_reply_writes_pi == 0);
+      assert_backtrace (phys_device == MACH_PORT_NULL);
+      assert_backtrace (phys_reply_writes == MACH_PORT_NULL);
+      assert_backtrace (phys_reply_writes_pi == 0);
       phys_device = device;
       err = ports_create_port (phys_reply_class, term_bucket,
 			       sizeof (struct port_info),
diff --git a/term/hurdio.c b/term/hurdio.c
index b34854cd..3456ef24 100644
--- a/term/hurdio.c
+++ b/term/hurdio.c
@@ -22,7 +22,7 @@
 
 #include <termios.h>
 
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <errno.h>
 #include <error.h>
 #include <string.h>
diff --git a/term/main.c b/term/main.c
index be014e18..2813d528 100644
--- a/term/main.c
+++ b/term/main.c
@@ -232,7 +232,7 @@ parse_opt (int opt, char *arg, struct argp_state *state)
 	      bottom = &hurdio_bottom;
 	      break;
 	    default:
-	      assert (! "impossible type");
+	      assert_backtrace (! "impossible type");
 	      break;
 	    }
 	  free (tty_arg);
diff --git a/term/munge.c b/term/munge.c
index 96b0df39..242dd367 100644
--- a/term/munge.c
+++ b/term/munge.c
@@ -306,7 +306,7 @@ erase_1 (char erase_char)
 	    write_erase_sequence ();
 	}
       if (echo_qsize == 0)
-	assert (echo_pstart == output_psize);
+	assert_backtrace (echo_pstart == output_psize);
     }
   else
     reprint_line ();
@@ -712,7 +712,7 @@ create_queue (int size, int lowat, int hiwat)
   struct queue *q;
 
   q = malloc (sizeof (struct queue) + size * sizeof (quoted_char));
-  assert (q);
+  assert_backtrace (q);
 
   q->susp = 0;
   q->lowat = lowat;
@@ -720,7 +720,7 @@ create_queue (int size, int lowat, int hiwat)
   q->cs = q->ce = q->array;
   q->arraylen = size;
   q->wait = malloc (sizeof (pthread_cond_t));
-  assert (q->wait);
+  assert_backtrace (q->wait);
 
   pthread_cond_init (q->wait, NULL);
   return q;
diff --git a/term/term.h b/term/term.h
index 0a428691..9125e999 100644
--- a/term/term.h
+++ b/term/term.h
@@ -22,7 +22,7 @@
 #define __HURD_TERM_H__
 
 #include <pthread.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <errno.h>
 #include <hurd/trivfs.h>
 #include <sys/types.h>
@@ -246,7 +246,7 @@ dequeue_quote (struct queue *q)
 {
   int beep = 0;
 
-  assert (qsize (q));
+  assert_backtrace (qsize (q));
   if (q->susp && (qsize (q) < q->lowat))
     {
       q->susp = 0;
@@ -340,7 +340,7 @@ queue_erase (struct queue *q)
   short answer;
   int beep = 0;
 
-  assert (qsize (q));
+  assert_backtrace (qsize (q));
   answer = *--q->ce;
   if (q->susp && (qsize (q) < q->lowat))
     {
diff --git a/term/users.c b/term/users.c
index 193b3582..4e8368e7 100644
--- a/term/users.c
+++ b/term/users.c
@@ -172,7 +172,7 @@ open_hook (struct trivfs_control *cntl,
     }
   else
     {
-      assert (open_count > 0);	/* XXX debugging */
+      assert_backtrace (open_count > 0);	/* XXX debugging */
 
       if (termflags & EXCL_USE)
 	{
@@ -254,7 +254,7 @@ pi_destroy_hook (struct trivfs_protid *cred)
   pthread_mutex_lock (&global_lock);
   if (cred->hook)
     {
-      assert (((struct protid_hook *)cred->hook)->refcnt > 0);
+      assert_backtrace (((struct protid_hook *)cred->hook)->refcnt > 0);
       if (--((struct protid_hook *)cred->hook)->refcnt == 0)
 	free (cred->hook);
     }
@@ -388,7 +388,7 @@ S_termctty_open_terminal (struct port_info *pi,
   if (!pi)
     return EOPNOTSUPP;
 
-  assert (pi == cttyid);
+  assert_backtrace (pi == cttyid);
 
   err = io_restrict_auth (termctl->underlying, &new_realnode, 0, 0, 0, 0);