API cleanup: Shuffle declarations around

Move declarations for stuff that is defined in libsquashfs.so into the
public headers and declarations for stuff that isn't, out of there.

Also move the meta reader/writer helper functions to their respective
headers.

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

6 files changed, 9 insertions, 4 deletions

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index d29c169..bf2e965 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -47,6 +47,7 @@ libsquashfs_la_SOURCES += include/sqfs/meta_reader.h include/sqfs/id_table.h
 libsquashfs_la_SOURCES += include/sqfs/compress.h include/sqfs/block_processor.h
 libsquashfs_la_SOURCES += include/sqfs/super.h include/sqfs/inode.h
 libsquashfs_la_SOURCES += include/sqfs/dir.h include/sqfs/xattr.h
+libsquashfs_la_SOURCES += include/sqfs/table.h
 libsquashfs_la_SOURCES += lib/sqfs/meta_writer.c lib/sqfs/super.c
 libsquashfs_la_SOURCES += lib/sqfs/id_table.c
 libsquashfs_la_SOURCES += lib/sqfs/write_table.c include/highlevel.h
@@ -111,6 +112,7 @@ sqfsinclude_HEADERS += include/sqfs/meta_reader.h include/sqfs/id_table.h
 sqfsinclude_HEADERS += include/sqfs/compress.h include/sqfs/block_processor.h
 sqfsinclude_HEADERS += include/sqfs/super.h include/sqfs/inode.h
 sqfsinclude_HEADERS += include/sqfs/dir.h include/sqfs/xattr.h
+sqfsinclude_HEADERS += include/sqfs/table.h
 
 noinst_LIBRARIES += libfstree.a libtar.a libsqfshelper.a
 noinst_LTLIBRARIES += libutil.la
diff --git a/lib/sqfs/read_inode.c b/lib/sqfs/read_inode.c
index 292f38e..10337a7 100644
--- a/lib/sqfs/read_inode.c
+++ b/lib/sqfs/read_inode.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "sqfs/meta_reader.h"
+#include "sqfs/inode.h"
 #include "util.h"
 
 #include <sys/stat.h>
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/readdir.c
index 30c6cf0..31e4c63 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/readdir.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "sqfs/meta_reader.h"
+#include "sqfs/dir.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfshelper/deserialize_fstree.c b/lib/sqfshelper/deserialize_fstree.c
index 26804db..232c382 100644
--- a/lib/sqfshelper/deserialize_fstree.c
+++ b/lib/sqfshelper/deserialize_fstree.c
@@ -7,6 +7,8 @@
 #include "config.h"
 
 #include "sqfs/meta_reader.h"
+#include "sqfs/dir.h"
+
 #include "xattr_reader.h"
 #include "highlevel.h"
 
diff --git a/lib/sqfshelper/write_dir.c b/lib/sqfshelper/write_dir.c
index 2b94667..b977bc4 100644
--- a/lib/sqfshelper/write_dir.c
+++ b/lib/sqfshelper/write_dir.c
@@ -6,11 +6,12 @@
  */
 #include "config.h"
 
-#include "sqfs/meta_writer.h"
 #include "sqfs/inode.h"
 #include "sqfs/dir.h"
+#include "highlevel.h"
 #include "util.h"
 
+#include <sys/stat.h>
 #include <assert.h>
 #include <endian.h>
 #include <stdlib.h>
diff --git a/lib/sqfshelper/write_inode.c b/lib/sqfshelper/write_inode.c
index 020eb64..1cd8e72 100644
--- a/lib/sqfshelper/write_inode.c
+++ b/lib/sqfshelper/write_inode.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "sqfs/meta_writer.h"
+#include "highlevel.h"
 #include "sqfs/inode.h"
 #include "sqfs/dir.h"
 #include "util.h"