Rename "hihglevel.h" to the more appropriate "common.h"

It only contains helpers for _common_ stuff for all the utilities. The
actual high level stuff has been moved to libsquashfs a while ago.

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

19 files changed, 24 insertions, 79 deletions

diff --git a/difftool/sqfsdiff.h b/difftool/sqfsdiff.h
index 2b3f2bd..8cef23a 100644
--- a/difftool/sqfsdiff.h
+++ b/difftool/sqfsdiff.h
@@ -8,9 +8,7 @@
 #define DIFFTOOL_H
 
 #include "config.h"
-
-#include "sqfs/error.h"
-#include "highlevel.h"
+#include "common.h"
 #include "fstree.h"
 #include "util.h"
 
diff --git a/include/highlevel.h b/include/common.h
index be2302b..d4e11c4 100644
--- a/include/highlevel.h
+++ b/include/common.h
@@ -1,19 +1,21 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 /*
- * highlevel.h
+ * common.h
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#ifndef HIGHLEVEL_H
-#define HIGHLEVEL_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include "config.h"
 
 #include "sqfs/xattr_writer.h"
+#include "sqfs/xattr_reader.h"
 #include "sqfs/compressor.h"
 #include "sqfs/id_table.h"
 #include "sqfs/inode.h"
 #include "sqfs/table.h"
+#include "sqfs/error.h"
 #include "sqfs/meta_writer.h"
 #include "sqfs/data_reader.h"
 #include "sqfs/data_writer.h"
@@ -134,4 +136,4 @@ void sqfs_writer_cleanup(sqfs_writer_t *sqfs);
 
 void sqfs_perror(const char *file, const char *action, int error_code);
 
-#endif /* HIGHLEVEL_H */
+#endif /* COMMON_H */
diff --git a/lib/sqfshelper/Makemodule.am b/lib/sqfshelper/Makemodule.am
index 870cc86..b72b904 100644
--- a/lib/sqfshelper/Makemodule.am
+++ b/lib/sqfshelper/Makemodule.am
@@ -5,7 +5,7 @@ libsqfshelper_a_SOURCES += lib/sqfshelper/print_version.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/inode_stat.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/data_reader_dump.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/compress.c lib/sqfshelper/comp_opt.c
-libsqfshelper_a_SOURCES += lib/sqfshelper/data_writer.c include/highlevel.h
+libsqfshelper_a_SOURCES += lib/sqfshelper/data_writer.c include/common.h
 libsqfshelper_a_SOURCES += lib/sqfshelper/get_path.c lib/sqfshelper/io_stdin.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/writer.c lib/sqfshelper/perror.c
 
diff --git a/lib/sqfshelper/comp_opt.c b/lib/sqfshelper/comp_opt.c
index fa4157b..2b92da3 100644
--- a/lib/sqfshelper/comp_opt.c
+++ b/lib/sqfshelper/comp_opt.c
@@ -4,9 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "highlevel.h"
+#include "common.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfshelper/compress.c b/lib/sqfshelper/compress.c
index 9f89e45..04e1f40 100644
--- a/lib/sqfshelper/compress.c
+++ b/lib/sqfshelper/compress.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "highlevel.h"
+#include "common.h"
 
 E_SQFS_COMPRESSOR compressor_get_default(void)
 {
diff --git a/lib/sqfshelper/data_reader_dump.c b/lib/sqfshelper/data_reader_dump.c
index 1a4ca65..140f527 100644
--- a/lib/sqfshelper/data_reader_dump.c
+++ b/lib/sqfshelper/data_reader_dump.c
@@ -4,11 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "sqfs/data_reader.h"
-#include "sqfs/block.h"
-#include "highlevel.h"
+#include "common.h"
 #include "util.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfshelper/data_writer.c b/lib/sqfshelper/data_writer.c
index 960cf77..36de154 100644
--- a/lib/sqfshelper/data_writer.c
+++ b/lib/sqfshelper/data_writer.c
@@ -4,9 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "highlevel.h"
+#include "common.h"
 #include "util.h"
 
 static sqfs_u8 buffer[4096];
diff --git a/lib/sqfshelper/get_path.c b/lib/sqfshelper/get_path.c
index a432b4a..bdc6c3f 100644
--- a/lib/sqfshelper/get_path.c
+++ b/lib/sqfshelper/get_path.c
@@ -4,9 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "highlevel.h"
+#include "common.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfshelper/inode_stat.c b/lib/sqfshelper/inode_stat.c
index 67ff764..a73436b 100644
--- a/lib/sqfshelper/inode_stat.c
+++ b/lib/sqfshelper/inode_stat.c
@@ -4,9 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "highlevel.h"
+#include "common.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfshelper/io_stdin.c b/lib/sqfshelper/io_stdin.c
index fec8db7..0e9fb17 100644
--- a/lib/sqfshelper/io_stdin.c
+++ b/lib/sqfshelper/io_stdin.c
@@ -4,10 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "highlevel.h"
-#include "sqfs/error.h"
+#include "common.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/sqfshelper/perror.c b/lib/sqfshelper/perror.c
index 6f972d8..9b9f041 100644
--- a/lib/sqfshelper/perror.c
+++ b/lib/sqfshelper/perror.c
@@ -4,11 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "sqfs/error.h"
-
-#include "highlevel.h"
+#include "common.h"
 
 #include <stdio.h>
 
diff --git a/lib/sqfshelper/serialize_fstree.c b/lib/sqfshelper/serialize_fstree.c
index c2d956f..14f0a42 100644
--- a/lib/sqfshelper/serialize_fstree.c
+++ b/lib/sqfshelper/serialize_fstree.c
@@ -4,15 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "sqfs/meta_writer.h"
-#include "sqfs/error.h"
-#include "sqfs/inode.h"
-#include "sqfs/dir.h"
-
-#include "highlevel.h"
-#include "util.h"
+#include "common.h"
 
 #include <assert.h>
 #include <unistd.h>
diff --git a/lib/sqfshelper/statistics.c b/lib/sqfshelper/statistics.c
index fb70615..a209461 100644
--- a/lib/sqfshelper/statistics.c
+++ b/lib/sqfshelper/statistics.c
@@ -4,10 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-#include "highlevel.h"
-
-#include "sqfs/block.h"
+#include "common.h"
 
 #include <stdio.h>
 
diff --git a/lib/sqfshelper/write_export_table.c b/lib/sqfshelper/write_export_table.c
index 154688e..c797577 100644
--- a/lib/sqfshelper/write_export_table.c
+++ b/lib/sqfshelper/write_export_table.c
@@ -4,10 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "highlevel.h"
-#include "util.h"
+#include "common.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/sqfshelper/writer.c b/lib/sqfshelper/writer.c
index 68d26a3..fa732ad 100644
--- a/lib/sqfshelper/writer.c
+++ b/lib/sqfshelper/writer.c
@@ -4,12 +4,7 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "config.h"
-
-#include "sqfs/error.h"
-
-#include "highlevel.h"
-#include "util.h"
+#include "common.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/mkfs/mkfs.h b/mkfs/mkfs.h
index 0c204e0..046a2a0 100644
--- a/mkfs/mkfs.h
+++ b/mkfs/mkfs.h
@@ -9,7 +9,7 @@
 
 #include "config.h"
 
-#include "highlevel.h"
+#include "common.h"
 #include "fstree.h"
 #include "util.h"
 
diff --git a/tar/sqfs2tar.c b/tar/sqfs2tar.c
index 7b306f9..331a907 100644
--- a/tar/sqfs2tar.c
+++ b/tar/sqfs2tar.c
@@ -5,13 +5,7 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-
-#include "sqfs/meta_reader.h"
-#include "sqfs/compressor.h"
-#include "sqfs/data_reader.h"
-#include "sqfs/xattr_reader.h"
-#include "sqfs/error.h"
-#include "highlevel.h"
+#include "common.h"
 #include "util.h"
 #include "tar.h"
 
diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c
index a22f2fe..81eb2e4 100644
--- a/tar/tar2sqfs.c
+++ b/tar/tar2sqfs.c
@@ -5,8 +5,7 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-
-#include "highlevel.h"
+#include "common.h"
 #include "tar.h"
 
 #include <stdlib.h>
diff --git a/unpack/rdsquashfs.h b/unpack/rdsquashfs.h
index 572a48b..c2af24a 100644
--- a/unpack/rdsquashfs.h
+++ b/unpack/rdsquashfs.h
@@ -8,17 +8,7 @@
 #define RDSQUASHFS_H
 
 #include "config.h"
-
-#include "sqfs/xattr_reader.h"
-#include "sqfs/meta_reader.h"
-#include "sqfs/data_reader.h"
-#include "sqfs/compressor.h"
-#include "sqfs/id_table.h"
-#include "sqfs/xattr.h"
-#include "sqfs/block.h"
-#include "sqfs/error.h"
-
-#include "highlevel.h"
+#include "common.h"
 #include "fstree.h"
 #include "util.h"