From 5ffeac25e3ae614e9c6b7d274962c8e0084907fd Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 30 Apr 2019 12:58:48 +0200 Subject: mksquashfs: merge headers Signed-off-by: David Oberhollenzer --- mkfs/Makemodule.am | 4 +--- mkfs/meta_writer.c | 2 +- mkfs/meta_writer.h | 24 ------------------------ mkfs/mksquashfs.h | 34 +++++++++++++++++++++++++++++++++- mkfs/options.c | 5 +---- mkfs/options.h | 20 -------------------- 6 files changed, 36 insertions(+), 53 deletions(-) delete mode 100644 mkfs/meta_writer.h delete mode 100644 mkfs/options.h (limited to 'mkfs') diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am index f1afdf5..82ac765 100644 --- a/mkfs/Makemodule.am +++ b/mkfs/Makemodule.am @@ -1,7 +1,5 @@ mksquashfs_SOURCES = mkfs/mksquashfs.c mkfs/mksquashfs.h -mksquashfs_SOURCES += mkfs/options.c mkfs/options.h -mksquashfs_SOURCES += mkfs/meta_writer.c mkfs/meta_writer.h -mksquashfs_SOURCES += mkfs/super.c +mksquashfs_SOURCES += mkfs/options.c mkfs/meta_writer.c mkfs/super.c mksquashfs_SOURCES += include/squashfs.h mksquashfs_LDADD = libfstree.a libcompress.a libutil.a diff --git a/mkfs/meta_writer.c b/mkfs/meta_writer.c index 97db1c1..3219c91 100644 --- a/mkfs/meta_writer.c +++ b/mkfs/meta_writer.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "meta_writer.h" +#include "mksquashfs.h" #include "util.h" #include diff --git a/mkfs/meta_writer.h b/mkfs/meta_writer.h deleted file mode 100644 index bfa4160..0000000 --- a/mkfs/meta_writer.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef META_WRITER_H -#define META_WRITER_H - -#include "squashfs.h" -#include "compress.h" - -typedef struct { - uint8_t data[SQFS_META_BLOCK_SIZE + 2]; - size_t offset; - size_t block_offset; - int outfd; - compressor_t *cmp; -} meta_writer_t; - -meta_writer_t *meta_writer_create(int fd, compressor_t *cmp); - -void meta_writer_destroy(meta_writer_t *m); - -int meta_writer_flush(meta_writer_t *m); - -int meta_writer_append(meta_writer_t *m, const void *data, size_t size); - -#endif /* META_WRITER_H */ diff --git a/mkfs/mksquashfs.h b/mkfs/mksquashfs.h index 8dda29c..677dad4 100644 --- a/mkfs/mksquashfs.h +++ b/mkfs/mksquashfs.h @@ -3,8 +3,9 @@ #define MKSQUASHFS_H #include "squashfs.h" -#include "options.h" +#include "compress.h" #include "fstree.h" +#include "config.h" #include #include @@ -13,10 +14,41 @@ #include #include +typedef struct { + unsigned int def_uid; + unsigned int def_gid; + unsigned int def_mode; + unsigned int def_mtime; + int outmode; + int compressor; + int blksz; + int devblksz; + const char *infile; + const char *outfile; +} options_t; + +typedef struct { + uint8_t data[SQFS_META_BLOCK_SIZE + 2]; + size_t offset; + size_t block_offset; + int outfd; + compressor_t *cmp; +} meta_writer_t; + +void process_command_line(options_t *opt, int argc, char **argv); + int sqfs_super_init(sqfs_super_t *s, const options_t *opt); int sqfs_padd_file(sqfs_super_t *s, const options_t *opt, int outfd); int sqfs_super_write(const sqfs_super_t *super, int outfd); +meta_writer_t *meta_writer_create(int fd, compressor_t *cmp); + +void meta_writer_destroy(meta_writer_t *m); + +int meta_writer_flush(meta_writer_t *m); + +int meta_writer_append(meta_writer_t *m, const void *data, size_t size); + #endif /* MKSQUASHFS_H */ diff --git a/mkfs/options.c b/mkfs/options.c index fedf404..d19e5af 100644 --- a/mkfs/options.c +++ b/mkfs/options.c @@ -1,8 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "compress.h" -#include "squashfs.h" -#include "options.h" -#include "config.h" +#include "mksquashfs.h" #include #include diff --git a/mkfs/options.h b/mkfs/options.h deleted file mode 100644 index dc11250..0000000 --- a/mkfs/options.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef OPTIONS_H -#define OPTIONS_H - -typedef struct { - unsigned int def_uid; - unsigned int def_gid; - unsigned int def_mode; - unsigned int def_mtime; - int outmode; - int compressor; - int blksz; - int devblksz; - const char *infile; - const char *outfile; -} options_t; - -void process_command_line(options_t *opt, int argc, char **argv); - -#endif /* OPTIONS_H */ -- cgit v1.2.3