X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Ffb-direct.c;h=d875fb06021bd87b7befebb6a2fac21eead75cae;hb=db2e817025638b9738e5ff8f8f5ccc1fbf68a2f3;hp=264905792acdf4b7e59aee727be86dc7890199a4;hpb=681b277c0aabea785a21e109dc07338847c0cb32;p=libucw.git

diff --git a/ucw/fb-direct.c b/ucw/fb-direct.c
index 26490579..d875fb06 100644
--- a/ucw/fb-direct.c
+++ b/ucw/fb-direct.c
@@ -25,12 +25,12 @@
 
 #undef LOCAL_DEBUG
 
-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
-#include "ucw/lfs.h"
-#include "ucw/asio.h"
-#include "ucw/conf.h"
-#include "ucw/threads.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/io.h>
+#include <ucw/asio.h>
+#include <ucw/conf.h>
+#include <ucw/threads.h>
 
 #include <string.h>
 #include <fcntl.h>
@@ -57,14 +57,14 @@ struct fb_direct {
   enum fbdir_mode mode;
   byte name[0];
 };
-#define FB_DIRECT(f) ((struct fb_direct *)(f)->is_fastbuf)
+#define FB_DIRECT(f) ((struct fb_direct *)(f))
 
 #ifndef TEST
-uns fbdir_cheat;
+uint fbdir_cheat;
 
 static struct cf_section fbdir_cf = {
   CF_ITEMS {
-    CF_UNS("Cheat", &fbdir_cheat),
+    CF_UINT("Cheat", &fbdir_cheat),
     CF_END
   }
 };
@@ -159,7 +159,7 @@ fbdir_refill(struct fastbuf *f)
   if (!r->status)
     return 0;
   if (r->status < 0)
-    bthrow(f, "fb.read", "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;
@@ -193,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)
-	    bthrow(f, "fb.write", "Error truncating %s: %m", f->name);
+	    bthrow(f, "write", "Error truncating %s: %m", f->name);
 	}
       else
 	asio_submit(r);
@@ -223,7 +223,7 @@ fbdir_seek(struct fastbuf *f, ucw_off_t pos, int whence)
 }
 
 static struct asio_queue *
-fbdir_get_io_queue(uns buffer_size, uns write_back)
+fbdir_get_io_queue(uint buffer_size, uint write_back)
 {
   struct ucwlib_context *ctx = ucwlib_thread_context();
   struct asio_queue *q = ctx->io_queue;
@@ -271,7 +271,7 @@ fbdir_close(struct fastbuf *f)
 }
 
 static int
-fbdir_config(struct fastbuf *f, uns item, int value)
+fbdir_config(struct fastbuf *f, uint item, int value)
 {
   int orig;
 
@@ -287,7 +287,7 @@ fbdir_config(struct fastbuf *f, uns item, int value)
 }
 
 struct fastbuf *
-fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uns buffer_size, uns read_ahead UNUSED, uns write_back)
+fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uint buffer_size, uint read_ahead UNUSED, uint write_back)
 {
   int namelen = strlen(name) + 1;
   struct fb_direct *F = xmalloc(sizeof(struct fb_direct) + namelen);
@@ -308,13 +308,12 @@ fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uns buffe
   f->close = fbdir_close;
   f->config = fbdir_config;
   f->can_overwrite_buffer = 2;
-  fb_tie(f);
   return f;
 }
 
 #ifdef TEST
 
-#include "ucw/getopt.h"
+#include <ucw/getopt.h>
 
 int main(int argc, char **argv)
 {