Fastbufs: Clean up exception handling

[libucw.git] / ucw / fb-direct.c

diff --git a/ucw/fb-direct.c b/ucw/fb-direct.c
index 15a4568ad90f6c925ffe57f3412208ab10c3f7b2..74249a31feb589525fe7b587cb7aedae5f461b7e 100644 (file)
--- a/ucw/fb-direct.c
+++ b/ucw/fb-direct.c
@@ -37,15 +37,6 @@
 #include <unistd.h>
 #include <stdio.h>
 
-uns fbdir_cheat;
-
-static struct cf_section fbdir_cf = {
-  CF_ITEMS {
-    CF_UNS("Cheat", &fbdir_cheat),
-    CF_END
-  }
-};
-
 #define FBDIR_ALIGN 512
 
 enum fbdir_mode {                              // Current operating mode
@@ -68,11 +59,22 @@ struct fb_direct {
 };
 #define FB_DIRECT(f) ((struct fb_direct *)(f)->is_fastbuf)
 
+#ifndef TEST
+uns fbdir_cheat;
+
+static struct cf_section fbdir_cf = {
+  CF_ITEMS {
+    CF_UNS("Cheat", &fbdir_cheat),
+    CF_END
+  }
+};
+
 static void CONSTRUCTOR
 fbdir_global_init(void)
 {
   cf_declare_section("FBDirect", &fbdir_cf, 0);
 }
+#endif
 
 static void
 fbdir_read_sync(struct fb_direct *F)
@@ -157,7 +159,7 @@ fbdir_refill(struct fastbuf *f)
   if (!r->status)
     return 0;
   if (r->status < 0)
-    die("Error reading %s: %s", f->name, strerror(r->returned_errno));
+    bthrow(f, "read", "Error reading %s: %s", f->name, strerror(r->returned_errno));
   f->bptr = f->buffer = r->buffer;
   f->bstop = f->bufend = f->buffer + r->status;
   f->pos += r->status;
@@ -191,7 +193,7 @@ fbdir_spout(struct fastbuf *f)
          asio_sync(F->io_queue);
          DBG("FB-DIRECT: Truncating at %llu", (long long)f->pos);
          if (ucw_ftruncate(F->fd, f->pos) < 0)
-           die("Error truncating %s: %m", f->name);
+           bthrow(f, "write", "Error truncating %s: %m", f->name);
        }
       else
        asio_submit(r);