X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffb-mmap.c;h=67b7f910d94d4cc9284f37ef8a1ec7434b1dd0ba;hb=ba92e10cb8a623a5c59305b51f8ef364998cd871;hp=b6f827751fcf7f8b5152f8694806437c7074c5fb;hpb=5f59a954af6350b5bec54fc5fe282aa68b72e77c;p=libucw.git

diff --git a/lib/fb-mmap.c b/lib/fb-mmap.c
index b6f82775..67b7f910 100644
--- a/lib/fb-mmap.c
+++ b/lib/fb-mmap.c
@@ -1,5 +1,5 @@
 /*
- *	Sherlock Library -- Fast Buffered I/O on Memory-Mapped Files
+ *	UCW Library -- Fast Buffered I/O on Memory-Mapped Files
  *
  *	(c) 2002 Martin Mares <mj@ucw.cz>
  *
@@ -12,7 +12,6 @@
 #include "lib/lfs.h"
 #include "lib/conf.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -22,16 +21,17 @@
 static uns mmap_window_size = 16*PAGE_SIZE;
 static uns mmap_extend_size = 4*PAGE_SIZE;
 
-static struct cfitem fbmm_config[] = {
-  { "FBMMap",		CT_SECTION,	NULL },
-  { "WindowSize",	CT_INT,		&mmap_window_size },
-  { "ExtendSize",	CT_INT,		&mmap_extend_size },
-  { NULL,		CT_STOP,	NULL }
+static struct cf_section fbmm_config = {
+  CF_ITEMS {
+    CF_UNS("WindowSize", &mmap_window_size),
+    CF_UNS("ExtendSize", &mmap_extend_size),
+    CF_END
+  }
 };
 
 static void CONSTRUCTOR fbmm_init_config(void)
 {
-  cf_register(fbmm_config);
+  cf_declare_section("FBMMap", &fbmm_config, 0);
 }
 
 struct fb_mmap {
@@ -51,8 +51,8 @@ bfmm_map_window(struct fastbuf *f)
   struct fb_mmap *F = FB_MMAP(f);
   sh_off_t pos0 = f->pos & ~(sh_off_t)(PAGE_SIZE-1);
   int l = MIN((sh_off_t)mmap_window_size, F->file_extend - pos0);
-  uns ll = ALIGN(l, PAGE_SIZE);
-  uns oll = ALIGN(f->bufend - f->buffer, PAGE_SIZE);
+  uns ll = ALIGN_TO(l, PAGE_SIZE);
+  uns oll = ALIGN_TO(f->bufend - f->buffer, PAGE_SIZE);
   int prot = ((F->mode & O_ACCMODE) == O_RDONLY) ? PROT_READ : (PROT_READ | PROT_WRITE);
 
   DBG(" ... Mapping %x(%x)+%x(%x) len=%x extend=%x", (int)pos0, (int)f->pos, ll, l, (int)F->file_size, (int)F->file_extend);
@@ -109,7 +109,7 @@ bfmm_spout(struct fastbuf *f)
   f->pos = end;
   if (f->pos >= F->file_extend)
     {
-      F->file_extend = ALIGN(F->file_extend + mmap_extend_size, (sh_off_t)PAGE_SIZE);
+      F->file_extend = ALIGN_TO(F->file_extend + mmap_extend_size, (sh_off_t)PAGE_SIZE);
       if (sh_ftruncate(F->fd, F->file_extend))
 	die("ftruncate(%s): %m", f->name);
     }
@@ -137,7 +137,7 @@ bfmm_close(struct fastbuf *f)
   struct fb_mmap *F = FB_MMAP(f);
 
   if (f->buffer)
-    munmap(f->buffer, ALIGN(f->bufend-f->buffer, PAGE_SIZE));
+    munmap(f->buffer, ALIGN_TO(f->bufend-f->buffer, PAGE_SIZE));
   if (F->file_extend > F->file_size &&
       sh_ftruncate(F->fd, F->file_size))
     die("ftruncate(%s): %m", f->name);