Cleanup: move libutil related headers to "util" sub directory

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

19 files changed, 19 insertions, 20 deletions

diff --git a/lib/sqfs/comp/compressor.c b/lib/sqfs/comp/compressor.c
index 902ce92..2e2e3a3 100644
--- a/lib/sqfs/comp/compressor.c
+++ b/lib/sqfs/comp/compressor.c
@@ -11,7 +11,6 @@
 #include <stdlib.h>
 
 #include "internal.h"
-#include "util.h"
 
 typedef sqfs_compressor_t *(*compressor_fun_t)
 	(const sqfs_compressor_config_t *cfg);
diff --git a/lib/sqfs/comp/internal.h b/lib/sqfs/comp/internal.h
index 52b7fe3..875a194 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 6a0db35..b105096 100644
--- a/lib/sqfs/data_reader.c
+++ b/lib/sqfs/data_reader.c
@@ -14,7 +14,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/data_writer/internal.h b/lib/sqfs/data_writer/internal.h
index ea66290..9c64b6c 100644
--- a/lib/sqfs/data_writer/internal.h
+++ b/lib/sqfs/data_writer/internal.h
@@ -16,7 +16,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/dir_reader.c b/lib/sqfs/dir_reader.c
index f8950d7..e1ff9bc 100644
--- a/lib/sqfs/dir_reader.c
+++ b/lib/sqfs/dir_reader.c
@@ -14,7 +14,7 @@
 #include "sqfs/inode.h"
 #include "sqfs/error.h"
 #include "sqfs/dir.h"
-#include "util.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 a4aebe6..5ce29b6 100644
--- a/lib/sqfs/dir_writer.c
+++ b/lib/sqfs/dir_writer.c
@@ -13,7 +13,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/id_table.c
index a320eca..4080015 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/id_table.c
@@ -11,7 +11,7 @@
 #include "sqfs/super.h"
 #include "sqfs/table.h"
 #include "sqfs/error.h"
-#include "compat.h"
+#include "util/compat.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/meta_reader.c
index 820e223..e8a17ad 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 <unistd.h>
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
index 26e7618..5db4fe7 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 7e59445..e47395a 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 6ac2ac4..437ee07 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 096ac1a..747c8bc 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/read_tree.c b/lib/sqfs/read_tree.c
index 3a43769..f9c2a4e 100644
--- a/lib/sqfs/read_tree.c
+++ b/lib/sqfs/read_tree.c
@@ -15,7 +15,7 @@
 #include "sqfs/inode.h"
 #include "sqfs/error.h"
 #include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/readdir.c
index 8899475..d800cb7 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/readdir.c
@@ -10,7 +10,7 @@
 #include "sqfs/meta_reader.h"
 #include "sqfs/error.h"
 #include "sqfs/dir.h"
-#include "compat.h"
+#include "util/compat.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/super.c b/lib/sqfs/super.c
index 8e39b55..15b185d 100644
--- a/lib/sqfs/super.c
+++ b/lib/sqfs/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>
 #include <unistd.h>
diff --git a/lib/sqfs/write_inode.c b/lib/sqfs/write_inode.c
index 2e69b80..c78c852 100644
--- a/lib/sqfs/write_inode.c
+++ b/lib/sqfs/write_inode.c
@@ -11,7 +11,7 @@
 #include "sqfs/error.h"
 #include "sqfs/inode.h"
 #include "sqfs/dir.h"
-#include "compat.h"
+#include "util/compat.h"
 
 static int write_block_sizes(sqfs_meta_writer_t *ir,
 			     const sqfs_inode_generic_t *n)
diff --git a/lib/sqfs/write_table.c b/lib/sqfs/write_table.c
index 1931b83..b8946a5 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_reader.c b/lib/sqfs/xattr_reader.c
index d5b003b..250b4bd 100644
--- a/lib/sqfs/xattr_reader.c
+++ b/lib/sqfs/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_writer.c b/lib/sqfs/xattr_writer.c
index 22d4639..18ca657 100644
--- a/lib/sqfs/xattr_writer.c
+++ b/lib/sqfs/xattr_writer.c
@@ -15,8 +15,8 @@
 #include "sqfs/block.h"
 #include "sqfs/io.h"
 
-#include "str_table.h"
-#include "util.h"
+#include "util/str_table.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>