From 835b293d35a209d38047126443d41fa7090daa4c Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@gnupg.org>
Date: Mon, 19 Jun 2017 21:20:57 +0200
Subject: Use our own variant of 'assert' and 'assert_perror'.

Our variants print stack traces on failures.  This will make locating
errors much easier.
---
 storeio/dev.c     | 8 ++++----
 storeio/pager.c   | 4 ++--
 storeio/storeio.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'storeio')

diff --git a/storeio/dev.c b/storeio/dev.c
index 614c257f..78e0a177 100644
--- a/storeio/dev.c
+++ b/storeio/dev.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include <hurd.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <string.h>
 #include <hurd/pager.h>
 #include <hurd/store.h>
@@ -106,7 +106,7 @@ dev_buf_rw (struct dev *dev, size_t buf_offs, size_t *io_offs, size_t *len,
 {
   size_t block_size = dev->store->block_size;
 
-  assert (dev_buf_is_active (dev));
+  assert_backtrace (dev_buf_is_active (dev));
 
   if (buf_offs + *len >= block_size)
     /* Only part of BUF lies within the buffer (or everything up
@@ -141,7 +141,7 @@ dev_open (struct dev *dev)
   const int flags = ((dev->readonly ? STORE_READONLY : 0)
 		     | (dev->no_fileio ? STORE_NO_FILEIO : 0));
 
-  assert (dev->store == 0);
+  assert_backtrace (dev->store == 0);
 
   if (dev->store_name == 0)
     {
@@ -188,7 +188,7 @@ dev_open (struct dev *dev)
 void
 dev_close (struct dev *dev)
 {
-  assert (dev->store);
+  assert_backtrace (dev->store);
 
   if (!dev->inhibit_cache)
     {
diff --git a/storeio/pager.c b/storeio/pager.c
index 54b17142..12387939 100644
--- a/storeio/pager.c
+++ b/storeio/pager.c
@@ -20,7 +20,7 @@
 
 #include <hurd.h>
 #include <hurd/pager.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <strings.h>
 #include <unistd.h>
 #include <errno.h>
@@ -115,7 +115,7 @@ void
 pager_notify_evict (struct user_pager_info *pager,
 		    vm_offset_t page)
 {
-  assert (!"unrequested notification on eviction");
+  assert_backtrace (!"unrequested notification on eviction");
 }
 
 /* The user must define this function.  It should report back (in
diff --git a/storeio/storeio.c b/storeio/storeio.c
index fcf2f30f..515944ed 100644
--- a/storeio/storeio.c
+++ b/storeio/storeio.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <error.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <fcntl.h>
 #include <argp.h>
 #include <argz.h>
-- 
cgit v1.2.3