aboutsummaryrefslogtreecommitdiff
path: root/lib/sqfs
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqfs')
-rw-r--r--lib/sqfs/Makemodule.am10
-rw-r--r--lib/sqfs/block_processor/internal.h6
-rw-r--r--lib/sqfs/block_writer.c2
-rw-r--r--lib/sqfs/comp/internal.h2
-rw-r--r--lib/sqfs/data_reader.c2
-rw-r--r--lib/sqfs/dir_reader/internal.h4
-rw-r--r--lib/sqfs/dir_writer.c4
-rw-r--r--lib/sqfs/frag_table.c2
-rw-r--r--lib/sqfs/id_table.c2
-rw-r--r--lib/sqfs/inode.c2
-rw-r--r--lib/sqfs/meta_reader.c2
-rw-r--r--lib/sqfs/meta_writer.c2
-rw-r--r--lib/sqfs/read_inode.c2
-rw-r--r--lib/sqfs/read_super.c2
-rw-r--r--lib/sqfs/read_table.c2
-rw-r--r--lib/sqfs/write_table.c2
-rw-r--r--lib/sqfs/xattr/xattr_reader.c2
-rw-r--r--lib/sqfs/xattr/xattr_writer.h8
18 files changed, 29 insertions, 29 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index aaf63d8..d49482e 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -44,14 +44,14 @@ libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS)
# directly "import" stuff from libutil
libsquashfs_la_SOURCES += lib/util/str_table.c lib/util/alloc.c
libsquashfs_la_SOURCES += lib/util/xxhash.c
-libsquashfs_la_SOURCES += lib/util/hash_table.c include/hash_table.h
-libsquashfs_la_SOURCES += lib/util/rbtree.c include/rbtree.h
-libsquashfs_la_SOURCES += lib/util/array.c include/array.h
+libsquashfs_la_SOURCES += lib/util/hash_table.c include/util/hash_table.h
+libsquashfs_la_SOURCES += lib/util/rbtree.c include/util/rbtree.h
+libsquashfs_la_SOURCES += lib/util/array.c include/util/array.h
libsquashfs_la_SOURCES += lib/util/is_memory_zero.c
-libsquashfs_la_SOURCES += include/threadpool.h
+libsquashfs_la_SOURCES += include/util/threadpool.h
if CUSTOM_ALLOC
-libsquashfs_la_SOURCES += lib/util/mempool.c include/mempool.h
+libsquashfs_la_SOURCES += lib/util/mempool.c include/util/mempool.h
endif
if WINDOWS
diff --git a/lib/sqfs/block_processor/internal.h b/lib/sqfs/block_processor/internal.h
index 1c184c5..0b2c88d 100644
--- a/lib/sqfs/block_processor/internal.h
+++ b/lib/sqfs/block_processor/internal.h
@@ -19,9 +19,9 @@
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "hash_table.h"
-#include "threadpool.h"
-#include "util.h"
+#include "util/hash_table.h"
+#include "util/threadpool.h"
+#include "util/util.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/sqfs/block_writer.c b/lib/sqfs/block_writer.c
index 54f0c89..1230c2d 100644
--- a/lib/sqfs/block_writer.c
+++ b/lib/sqfs/block_writer.c
@@ -11,7 +11,7 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/comp/internal.h b/lib/sqfs/comp/internal.h
index 0566683..e4c3dd8 100644
--- a/lib/sqfs/comp/internal.h
+++ b/lib/sqfs/comp/internal.h
@@ -14,7 +14,7 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
SQFS_INTERNAL
int sqfs_generic_write_options(sqfs_file_t *file, const void *data,
diff --git a/lib/sqfs/data_reader.c b/lib/sqfs/data_reader.c
index e3a2eef..1033db9 100644
--- a/lib/sqfs/data_reader.c
+++ b/lib/sqfs/data_reader.c
@@ -15,7 +15,7 @@
#include "sqfs/table.h"
#include "sqfs/inode.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/dir_reader/internal.h b/lib/sqfs/dir_reader/internal.h
index 4b2ed21..7275cd2 100644
--- a/lib/sqfs/dir_reader/internal.h
+++ b/lib/sqfs/dir_reader/internal.h
@@ -17,8 +17,8 @@
#include "sqfs/inode.h"
#include "sqfs/error.h"
#include "sqfs/dir.h"
-#include "rbtree.h"
-#include "util.h"
+#include "util/rbtree.h"
+#include "util/util.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/sqfs/dir_writer.c b/lib/sqfs/dir_writer.c
index ad44458..a02faa7 100644
--- a/lib/sqfs/dir_writer.c
+++ b/lib/sqfs/dir_writer.c
@@ -15,8 +15,8 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "sqfs/dir.h"
-#include "array.h"
-#include "util.h"
+#include "util/array.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/frag_table.c b/lib/sqfs/frag_table.c
index f15da5c..71627df 100644
--- a/lib/sqfs/frag_table.c
+++ b/lib/sqfs/frag_table.c
@@ -13,7 +13,7 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "compat.h"
-#include "array.h"
+#include "util/array.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/id_table.c
index 746a5cc..cebf64b 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/id_table.c
@@ -12,7 +12,7 @@
#include "sqfs/table.h"
#include "sqfs/error.h"
#include "compat.h"
-#include "array.h"
+#include "util/array.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/inode.c b/lib/sqfs/inode.c
index 01e5ebe..0fb4809 100644
--- a/lib/sqfs/inode.c
+++ b/lib/sqfs/inode.c
@@ -14,7 +14,7 @@
#include <string.h>
#include <stdlib.h>
-#include "util.h"
+#include "util/util.h"
static int inverse_type[] = {
[SQFS_INODE_DIR] = SQFS_INODE_EXT_DIR,
diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/meta_reader.c
index 94da268..cddcda6 100644
--- a/lib/sqfs/meta_reader.c
+++ b/lib/sqfs/meta_reader.c
@@ -12,7 +12,7 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
index 80f0fdd..2314e06 100644
--- a/lib/sqfs/meta_writer.c
+++ b/lib/sqfs/meta_writer.c
@@ -12,7 +12,7 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <string.h>
#include <stdlib.h>
diff --git a/lib/sqfs/read_inode.c b/lib/sqfs/read_inode.c
index 4f9fd3c..12bef48 100644
--- a/lib/sqfs/read_inode.c
+++ b/lib/sqfs/read_inode.c
@@ -12,7 +12,7 @@
#include "sqfs/super.h"
#include "sqfs/inode.h"
#include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/read_super.c b/lib/sqfs/read_super.c
index 919e720..11bc314 100644
--- a/lib/sqfs/read_super.c
+++ b/lib/sqfs/read_super.c
@@ -10,7 +10,7 @@
#include "sqfs/super.h"
#include "sqfs/error.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <string.h>
diff --git a/lib/sqfs/read_table.c b/lib/sqfs/read_table.c
index 1c9c8ad..8f9bddd 100644
--- a/lib/sqfs/read_table.c
+++ b/lib/sqfs/read_table.c
@@ -12,7 +12,7 @@
#include "sqfs/table.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
diff --git a/lib/sqfs/write_table.c b/lib/sqfs/write_table.c
index b198941..7f1b201 100644
--- a/lib/sqfs/write_table.c
+++ b/lib/sqfs/write_table.c
@@ -13,7 +13,7 @@
#include "sqfs/table.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
diff --git a/lib/sqfs/xattr/xattr_reader.c b/lib/sqfs/xattr/xattr_reader.c
index d3adc46..a55ad2f 100644
--- a/lib/sqfs/xattr/xattr_reader.c
+++ b/lib/sqfs/xattr/xattr_reader.c
@@ -14,7 +14,7 @@
#include "sqfs/error.h"
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/sqfs/xattr/xattr_writer.h b/lib/sqfs/xattr/xattr_writer.h
index 6f414b8..792cfae 100644
--- a/lib/sqfs/xattr/xattr_writer.h
+++ b/lib/sqfs/xattr/xattr_writer.h
@@ -18,10 +18,10 @@
#include "sqfs/block.h"
#include "sqfs/io.h"
-#include "str_table.h"
-#include "rbtree.h"
-#include "array.h"
-#include "util.h"
+#include "util/str_table.h"
+#include "util/rbtree.h"
+#include "util/array.h"
+#include "util/util.h"
#include <stdlib.h>
#include <string.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 11:34:39 +0000