Heap: Adjust callers

[libucw.git] / ucw / partmap.c

diff --git a/ucw/partmap.c b/ucw/partmap.c
index c2b90f8f1ac1d80cf7d6df9acae1f426f9dbe1b8..4f75f91e44b7a42e1ab18b056ddd4ad3dfa663eb 100644 (file)
--- a/ucw/partmap.c
+++ b/ucw/partmap.c
@@ -2,15 +2,15 @@
  *     UCW Library -- Mapping of File Parts
  *
  *     (c) 2003--2006 Martin Mares <mj@ucw.cz>
- *     (c) 2003--2005 Robert Spalek <robert@ucw.cz>
+ *     (c) 2003--2009 Robert Spalek <robert@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/lfs.h"
-#include "ucw/partmap.h"
+#include <ucw/lib.h>
+#include <ucw/io.h>
+#include <ucw/partmap.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#ifdef CONFIG_PARTMAP_IS_MMAP
+#ifdef CONFIG_UCW_PARTMAP_IS_MMAP
 #define PARTMAP_WINDOW ~(size_t)0
 #else
 #ifdef TEST
@@ -34,19 +34,19 @@ partmap_open(char *name, int writeable)
 {
   struct partmap *p = xmalloc_zero(sizeof(struct partmap));
 
-  p->fd = sh_open(name, writeable ? O_RDWR : O_RDONLY);
+  p->fd = ucw_open(name, writeable ? O_RDWR : O_RDONLY);
   if (p->fd < 0)
     die("open(%s): %m", name);
-  if ((p->file_size = sh_seek(p->fd, 0, SEEK_END)) < 0)
+  if ((p->file_size = ucw_seek(p->fd, 0, SEEK_END)) < 0)
     die("lseek(%s): %m", name);
   p->writeable = writeable;
-#ifdef CONFIG_PARTMAP_IS_MMAP
+#ifdef CONFIG_UCW_PARTMAP_IS_MMAP
   partmap_load(p, 0, p->file_size);
 #endif
   return p;
 }
 
-sh_off_t
+ucw_off_t
 partmap_size(struct partmap *p)
 {
   return p->file_size;
@@ -62,20 +62,25 @@ partmap_close(struct partmap *p)
 }
 
 void
-partmap_load(struct partmap *p, sh_off_t start, uns size)
+partmap_load(struct partmap *p, ucw_off_t start, uns size)
 {
   if (p->start_map)
     munmap(p->start_map, p->end_off - p->start_off);
-  sh_off_t end = start + size;
-  sh_off_t win_start = start/CPU_PAGE_SIZE * CPU_PAGE_SIZE;
+  ucw_off_t end = start + size;
+  ucw_off_t win_start = start/CPU_PAGE_SIZE * CPU_PAGE_SIZE;
   size_t win_len = PARTMAP_WINDOW;
-  if ((sh_off_t) (win_start+win_len) > p->file_size)
+  if (win_len > (size_t) (p->file_size - win_start))
     win_len = ALIGN_TO(p->file_size - win_start, CPU_PAGE_SIZE);
-  if ((sh_off_t) (win_start+win_len) < end)
+  if ((ucw_off_t) (win_start+win_len) < end)
     die("partmap_map: Window is too small for mapping %d bytes", size);
-  p->start_map = sh_mmap(NULL, win_len, p->writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, p->fd, win_start);
-  if (p->start_map == MAP_FAILED)
-    die("mmap failed at position %lld: %m", (long long)win_start);
+  if (win_len)
+    {
+      p->start_map = ucw_mmap(NULL, win_len, p->writeable ? (PROT_READ | PROT_WRITE) : PROT_READ, MAP_SHARED, p->fd, win_start);
+      if (p->start_map == MAP_FAILED)
+       die("mmap failed at position %lld: %m", (long long)win_start);
+    }
+  else
+    p->start_map = NULL;
   p->start_off = win_start;
   p->end_off = win_start+win_len;
   madvise(p->start_map, win_len, MADV_SEQUENTIAL);