Move bitmap macros to header to be used by other units.

diff --git a/fsck/main.c b/fsck/main.c
index 27ced56..fb69df1 100644 (file)
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -28,8 +28,6 @@
 
 #define MB (1024 * 1024)
 
-#define BMAP_GET(bitmap, index) ((bitmap)[(index) / 8] & (1u << ((index) % 8)))
-
 uint64_t files_count, directories_count;
 
 static uint64_t bytes2mb(uint64_t bytes)

diff --git a/libexfat/cluster.c b/libexfat/cluster.c
index 0f2d76a..3618ce5 100644 (file)
--- a/libexfat/cluster.c
+++ b/libexfat/cluster.c
@@ -22,10 +22,6 @@
 #include <errno.h>
 #include <string.h>
 
-#define BMAP_GET(bitmap, index) ((bitmap)[(index) / 8] & (1u << ((index) % 8)))
-#define BMAP_SET(bitmap, index) (bitmap)[(index) / 8] |= (1u << ((index) % 8))
-#define BMAP_CLR(bitmap, index) (bitmap)[(index) / 8] &= ~(1u << ((index) % 8))
-
 /*
  * Block to absolute offset.
  */

diff --git a/libexfat/exfat.h b/libexfat/exfat.h
index 0f9d3e4..a5614b2 100644 (file)
--- a/libexfat/exfat.h
+++ b/libexfat/exfat.h
@@ -43,6 +43,13 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define DIV_ROUND_UP(x, d) (((x) + (d) - 1) / (d))
 
+#define BMAP_GET(bitmap, index) \
+       (((uint8_t*) bitmap)[(index) / 8] & (1u << ((index) % 8)))
+#define BMAP_SET(bitmap, index) \
+       ((uint8_t*) bitmap)[(index) / 8] |= (1u << ((index) % 8))
+#define BMAP_CLR(bitmap, index) \
+       ((uint8_t*) bitmap)[(index) / 8] &= ~(1u << ((index) % 8))
+
 struct exfat_node
 {
        struct exfat_node* parent;