cleanup data reader

 - Split block reading code out from "dump_blocks" into precache_data_block,
   similar to precache_fragment_block
 - Merge the code paths for fragment/data block reading and uncompression

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 4 insertions, 0 deletions

diff --git a/include/squashfs.h b/include/squashfs.h
index fb60049..eb35fdd 100644
--- a/include/squashfs.h
+++ b/include/squashfs.h
@@ -21,6 +21,10 @@
 #define SQFS_DEVBLK_SIZE 4096
 #define SQFS_MAX_DIR_ENT 256
 
+#define SQFS_IS_BLOCK_COMPRESSED(size) (((size) & (1 << 24)) == 0)
+#define SQFS_ON_DISK_BLOCK_SIZE(size) ((size) & ((1 << 24) - 1))
+#define SQFS_IS_SPARSE_BLOCK(size) (SQFS_ON_DISK_BLOCK_SIZE(size) == 0)
+
 typedef struct {
 	uint32_t magic;
 	uint32_t inode_count;