Rename table.h to highlevel.h

The idea is to move various higher level helper functions there.

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

7 files changed, 10 insertions, 11 deletions

diff --git a/include/table.h b/include/highlevel.h
index 57d8654..e69e337 100644
--- a/include/table.h
+++ b/include/highlevel.h
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#ifndef TABLE_H
-#define TABLE_H
+#ifndef HIGHLEVEL_H
+#define HIGHLEVEL_H
 
 #include "squashfs.h"
 #include "compress.h"
+#include "id_table.h"
 #include "fstree.h"
 
 #include <stdint.h>
@@ -39,4 +40,4 @@ int sqfs_write_table(int outfd, sqfs_super_t *super, const void *data,
 int sqfs_serialize_fstree(int outfd, sqfs_super_t *super, fstree_t *fs,
 			  compressor_t *cmp, id_table_t *idtbl);
 
-#endif /* TABLE_H */
+#endif /* HIGHLEVEL_H */
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 618fbf2..ff63a7f 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -13,7 +13,7 @@ libcompress_a_CPPFLAGS = $(AM_CPPFLAGS)
 libsquashfs_a_SOURCES = include/meta_writer.h include/squashfs.h
 libsquashfs_a_SOURCES += lib/sqfs/meta_writer.c lib/sqfs/super.c
 libsquashfs_a_SOURCES += lib/sqfs/id_table.c include/id_table.h
-libsquashfs_a_SOURCES += lib/sqfs/table.c include/table.h
+libsquashfs_a_SOURCES += lib/sqfs/table.c include/highlevel.h
 libsquashfs_a_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c
 libsquashfs_a_SOURCES += include/meta_reader.h lib/sqfs/id_table_write.c
 libsquashfs_a_SOURCES += lib/sqfs/id_table_read.c lib/sqfs/read_inode.c
diff --git a/lib/sqfs/id_table_read.c b/lib/sqfs/id_table_read.c
index b1305ff..6e1789d 100644
--- a/lib/sqfs/id_table_read.c
+++ b/lib/sqfs/id_table_read.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 #include "meta_reader.h"
-#include "id_table.h"
-#include "table.h"
+#include "highlevel.h"
 #include "util.h"
 
 #include <stdlib.h>
diff --git a/lib/sqfs/id_table_write.c b/lib/sqfs/id_table_write.c
index 9a5aa48..c11895d 100644
--- a/lib/sqfs/id_table_write.c
+++ b/lib/sqfs/id_table_write.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
-#include "id_table.h"
-#include "table.h"
+#include "highlevel.h"
 
 int id_table_write(id_table_t *tbl, int outfd, sqfs_super_t *super,
 		   compressor_t *cmp)
diff --git a/lib/sqfs/serialize_fstree.c b/lib/sqfs/serialize_fstree.c
index 95b9144..44aeca4 100644
--- a/lib/sqfs/serialize_fstree.c
+++ b/lib/sqfs/serialize_fstree.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 #include "meta_writer.h"
-#include "table.h"
+#include "highlevel.h"
 #include "util.h"
 
 #include <unistd.h>
diff --git a/lib/sqfs/table.c b/lib/sqfs/table.c
index 4e0f9d1..abc95bd 100644
--- a/lib/sqfs/table.c
+++ b/lib/sqfs/table.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 #include "meta_writer.h"
-#include "table.h"
+#include "highlevel.h"
 #include "util.h"
 
 #include <endian.h>
diff --git a/mkfs/mkfs.h b/mkfs/mkfs.h
index 5d16c8b..2bcc8e0 100644
--- a/mkfs/mkfs.h
+++ b/mkfs/mkfs.h
@@ -3,12 +3,12 @@
 #define MKFS_H
 
 #include "meta_writer.h"
+#include "highlevel.h"
 #include "squashfs.h"
 #include "compress.h"
 #include "id_table.h"
 #include "fstree.h"
 #include "config.h"
-#include "table.h"
 
 #include <assert.h>
 #include <unistd.h>