X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Ffb-mmap.c;h=d355a66253d3310428476e39889c015625c1144a;hb=d4123b266f32fe1c84c03cc66ed7cc6c943a355b;hp=fa0f03e03232bf6fa0b734e767278a967eb44e9f;hpb=f501fcf311379b78506474478a17d82382b753e4;p=libucw.git

diff --git a/ucw/fb-mmap.c b/ucw/fb-mmap.c
index fa0f03e0..d355a662 100644
--- a/ucw/fb-mmap.c
+++ b/ucw/fb-mmap.c
@@ -9,10 +9,10 @@
 
 #undef LOCAL_DEBUG
 
-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
-#include "ucw/lfs.h"
-#include "ucw/conf.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+#include <ucw/conf.h>
 
 #include <string.h>
 #include <fcntl.h>
@@ -47,7 +47,7 @@ struct fb_mmap {
   uns window_size;
   int mode;
 };
-#define FB_MMAP(f) ((struct fb_mmap *)(f)->is_fastbuf)
+#define FB_MMAP(f) ((struct fb_mmap *)(f))
 
 static void
 bfmm_map_window(struct fastbuf *f)
@@ -182,7 +182,7 @@ bfmmopen_internal(int fd, const char *name, uns mode)
   F->fd = fd;
   F->file_extend = F->file_size = ucw_seek(fd, 0, SEEK_END);
   if (F->file_size < 0)
-    die("seek(%s): %m", name);
+    bthrow(f, "open", "fb-mmap: Cannot detect size of %s -- is it seekable?", name);
   if (mode & O_APPEND)
     f->pos = F->file_size;
   F->mode = mode;