From 5597dca9c6053cd19104e18d88edb199b32e3743 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 7 Oct 2019 13:49:40 +0200 Subject: 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 --- lib/sqfshelper/Makemodule.am | 2 +- lib/sqfshelper/comp_opt.c | 4 +--- lib/sqfshelper/compress.c | 2 +- lib/sqfshelper/data_reader_dump.c | 6 +----- lib/sqfshelper/data_writer.c | 4 +--- lib/sqfshelper/get_path.c | 4 +--- lib/sqfshelper/inode_stat.c | 4 +--- lib/sqfshelper/io_stdin.c | 5 +---- lib/sqfshelper/perror.c | 6 +----- lib/sqfshelper/serialize_fstree.c | 10 +--------- lib/sqfshelper/statistics.c | 5 +---- lib/sqfshelper/write_export_table.c | 5 +---- lib/sqfshelper/writer.c | 7 +------ 13 files changed, 13 insertions(+), 51 deletions(-) (limited to 'lib') 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 */ -#include "config.h" - -#include "highlevel.h" +#include "common.h" #include #include 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 */ -#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 */ -#include "config.h" - -#include "sqfs/data_reader.h" -#include "sqfs/block.h" -#include "highlevel.h" +#include "common.h" #include "util.h" #include 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 */ -#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 */ -#include "config.h" - -#include "highlevel.h" +#include "common.h" #include #include 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 */ -#include "config.h" - -#include "highlevel.h" +#include "common.h" #include #include 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 */ -#include "config.h" - -#include "highlevel.h" -#include "sqfs/error.h" +#include "common.h" #include #include 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 */ -#include "config.h" - -#include "sqfs/error.h" - -#include "highlevel.h" +#include "common.h" #include 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 */ -#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 #include 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 */ -#include "config.h" -#include "highlevel.h" - -#include "sqfs/block.h" +#include "common.h" #include 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 */ -#include "config.h" - -#include "highlevel.h" -#include "util.h" +#include "common.h" #include #include 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 */ -#include "config.h" - -#include "sqfs/error.h" - -#include "highlevel.h" -#include "util.h" +#include "common.h" #include #include -- cgit v1.2.3