xtypes&tableprinter: added parsing of size and tests

[libucw.git] / ucw / partmap.h

diff --git a/ucw/partmap.h b/ucw/partmap.h
index 985b36267ade51bfa2def9893fd5b985b8dd72e9..15d0887f6e5d0dc403a81ed7546b16482c1a1b79 100644 (file)
--- a/ucw/partmap.h
+++ b/ucw/partmap.h
@@ -11,34 +11,39 @@
 #ifndef _UCW_PARTMAP_H
 #define _UCW_PARTMAP_H
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define partmap_close ucw_partmap_close
+#define partmap_load ucw_partmap_load
+#define partmap_open ucw_partmap_open
+#define partmap_size ucw_partmap_size
+#endif
+
 struct partmap {
   int fd;
-  sh_off_t file_size;
-  sh_off_t start_off, end_off;
+  ucw_off_t file_size;
+  ucw_off_t start_off, end_off;
   byte *start_map;
   int writeable;
 };
 
 struct partmap *partmap_open(char *name, int writeable);
 void partmap_close(struct partmap *p);
-sh_off_t partmap_size(struct partmap *p);
-void partmap_load(struct partmap *p, sh_off_t start, uns size);
+ucw_off_t partmap_size(struct partmap *p);
+void partmap_load(struct partmap *p, ucw_off_t start, uint size);
 
-static inline void *
-partmap_map(struct partmap *p, sh_off_t start, uns size UNUSED)
+static inline void *partmap_map(struct partmap *p, ucw_off_t start, uint size UNUSED)
 {
-#ifndef CONFIG_PARTMAP_IS_MMAP
-  if (unlikely(!p->start_map || start < p->start_off || (sh_off_t) (start+size) > p->end_off))
+#ifndef CONFIG_UCW_PARTMAP_IS_MMAP
+  if (unlikely(!p->start_map || start < p->start_off || (ucw_off_t) (start+size) > p->end_off))
     partmap_load(p, start, size);
 #endif
   return p->start_map + (start - p->start_off);
 }
 
-static inline void *
-partmap_map_forward(struct partmap *p, sh_off_t start, uns size UNUSED)
+static inline void *partmap_map_forward(struct partmap *p, ucw_off_t start, uint size UNUSED)
 {
-#ifndef CONFIG_PARTMAP_IS_MMAP
-  if (unlikely((sh_off_t) (start+size) > p->end_off))
+#ifndef CONFIG_UCW_PARTMAP_IS_MMAP
+  if (unlikely((ucw_off_t) (start+size) > p->end_off))
     partmap_load(p, start, size);
 #endif
   return p->start_map + (start - p->start_off);