From b01961c0e72ab287520fcd61b47ef8faf141cf3f Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 27 Sep 2019 15:58:27 +0200 Subject: Cleanup: merge data.h into block.h Signed-off-by: David Oberhollenzer --- lib/sqfs/Makemodule.am | 2 +- lib/sqfs/comp/internal.h | 2 +- lib/sqfs/data_reader.c | 1 - lib/sqfs/data_writer/internal.h | 1 - lib/sqfs/dir_writer.c | 2 +- lib/sqfs/meta_reader.c | 2 +- lib/sqfs/meta_writer.c | 2 +- lib/sqfs/read_table.c | 2 +- lib/sqfs/write_table.c | 2 +- lib/sqfs/xattr_reader.c | 2 +- 10 files changed, 8 insertions(+), 10 deletions(-) (limited to 'lib/sqfs') diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am index fe6101a..72e3987 100644 --- a/lib/sqfs/Makemodule.am +++ b/lib/sqfs/Makemodule.am @@ -1,4 +1,4 @@ -LIBSQFS_HEARDS = include/sqfs/data.h include/sqfs/meta_writer.h \ +LIBSQFS_HEARDS = include/sqfs/meta_writer.h \ include/sqfs/meta_reader.h include/sqfs/id_table.h \ include/sqfs/compress.h include/sqfs/data_writer.h \ include/sqfs/super.h include/sqfs/inode.h \ diff --git a/lib/sqfs/comp/internal.h b/lib/sqfs/comp/internal.h index 94b4c8c..fcccd0c 100644 --- a/lib/sqfs/comp/internal.h +++ b/lib/sqfs/comp/internal.h @@ -12,7 +12,7 @@ #include "sqfs/predef.h" #include "sqfs/compress.h" #include "sqfs/error.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/data_reader.c b/lib/sqfs/data_reader.c index d8645d1..862723d 100644 --- a/lib/sqfs/data_reader.c +++ b/lib/sqfs/data_reader.c @@ -13,7 +13,6 @@ #include "sqfs/error.h" #include "sqfs/table.h" #include "sqfs/inode.h" -#include "sqfs/data.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/data_writer/internal.h b/lib/sqfs/data_writer/internal.h index 1aa600b..b1d9d8c 100644 --- a/lib/sqfs/data_writer/internal.h +++ b/lib/sqfs/data_writer/internal.h @@ -15,7 +15,6 @@ #include "sqfs/table.h" #include "sqfs/error.h" #include "sqfs/block.h" -#include "sqfs/data.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/dir_writer.c b/lib/sqfs/dir_writer.c index 4d90c1a..6b38c04 100644 --- a/lib/sqfs/dir_writer.c +++ b/lib/sqfs/dir_writer.c @@ -11,7 +11,7 @@ #include "sqfs/dir_writer.h" #include "sqfs/inode.h" #include "sqfs/error.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/dir.h" #include "util.h" diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/meta_reader.c index 08ac28d..89d698b 100644 --- a/lib/sqfs/meta_reader.c +++ b/lib/sqfs/meta_reader.c @@ -10,7 +10,7 @@ #include "sqfs/meta_reader.h" #include "sqfs/compress.h" #include "sqfs/error.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c index 4dd87a5..2edc91a 100644 --- a/lib/sqfs/meta_writer.c +++ b/lib/sqfs/meta_writer.c @@ -10,7 +10,7 @@ #include "sqfs/meta_writer.h" #include "sqfs/compress.h" #include "sqfs/error.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/read_table.c b/lib/sqfs/read_table.c index e5461a4..239607e 100644 --- a/lib/sqfs/read_table.c +++ b/lib/sqfs/read_table.c @@ -10,7 +10,7 @@ #include "sqfs/meta_reader.h" #include "sqfs/error.h" #include "sqfs/table.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/write_table.c b/lib/sqfs/write_table.c index bef576d..5f11769 100644 --- a/lib/sqfs/write_table.c +++ b/lib/sqfs/write_table.c @@ -11,7 +11,7 @@ #include "sqfs/error.h" #include "sqfs/super.h" #include "sqfs/table.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/io.h" #include "util.h" diff --git a/lib/sqfs/xattr_reader.c b/lib/sqfs/xattr_reader.c index d0c8800..4164f66 100644 --- a/lib/sqfs/xattr_reader.c +++ b/lib/sqfs/xattr_reader.c @@ -11,7 +11,7 @@ #include "sqfs/super.h" #include "sqfs/xattr.h" #include "sqfs/error.h" -#include "sqfs/data.h" +#include "sqfs/block.h" #include "sqfs/io.h" #include "util.h" -- cgit v1.2.3