From e71c56420a8fc3dc7e36eb059304a362b47a1c15 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 7 Sep 2019 01:24:19 +0200 Subject: Move meta reader/writer functions to respective headers The dir.h and inode.h headers contained meta data reader/writer related functions. This commit moves them to the propper headers. Signed-off-by: David Oberhollenzer --- include/sqfs/dir.h | 8 -------- include/sqfs/inode.h | 19 ------------------- include/sqfs/meta_reader.h | 16 ++++++++++++++++ include/sqfs/meta_writer.h | 3 +++ 4 files changed, 19 insertions(+), 27 deletions(-) (limited to 'include/sqfs') diff --git a/include/sqfs/dir.h b/include/sqfs/dir.h index 0b14cdf..196d135 100644 --- a/include/sqfs/dir.h +++ b/include/sqfs/dir.h @@ -36,14 +36,6 @@ struct sqfs_dir_index_t { extern "C" { #endif -/* Returns 0 on success. Internally prints to stderr on failure */ -SQFS_API int sqfs_meta_reader_read_dir_header(sqfs_meta_reader_t *m, - sqfs_dir_header_t *hdr); - -/* Entry can be freed with a single free() call. - The function internally prints to stderr on failure */ -SQFS_API sqfs_dir_entry_t *sqfs_meta_reader_read_dir_ent(sqfs_meta_reader_t *m); - SQFS_API sqfs_dir_writer_t *sqfs_dir_writer_create(sqfs_meta_writer_t *dm); SQFS_API void sqfs_dir_writer_destroy(sqfs_dir_writer_t *writer); diff --git a/include/sqfs/inode.h b/include/sqfs/inode.h index 3cf1d8c..76d1a7c 100644 --- a/include/sqfs/inode.h +++ b/include/sqfs/inode.h @@ -127,23 +127,4 @@ struct sqfs_inode_generic_t { uint8_t extra[]; }; -#ifdef __cplusplus -extern "C" { -#endif - -/* Inode can be freed with a single free() call. - The function internally prints error message to stderr on failure. */ -SQFS_API -sqfs_inode_generic_t *sqfs_meta_reader_read_inode(sqfs_meta_reader_t *ir, - sqfs_super_t *super, - uint64_t block_start, - size_t offset); - -SQFS_API int sqfs_meta_writer_write_inode(sqfs_meta_writer_t *iw, - sqfs_inode_generic_t *n); - -#ifdef __cplusplus -} -#endif - #endif /* SQFS_INODE_H */ diff --git a/include/sqfs/meta_reader.h b/include/sqfs/meta_reader.h index eef18b7..a529dba 100644 --- a/include/sqfs/meta_reader.h +++ b/include/sqfs/meta_reader.h @@ -38,6 +38,22 @@ SQFS_API void sqfs_meta_reader_get_position(sqfs_meta_reader_t *m, SQFS_API int sqfs_meta_reader_read(sqfs_meta_reader_t *m, void *data, size_t size); +/* Returns 0 on success. Internally prints to stderr on failure */ +SQFS_API int sqfs_meta_reader_read_dir_header(sqfs_meta_reader_t *m, + sqfs_dir_header_t *hdr); + +/* Entry can be freed with a single free() call. + The function internally prints to stderr on failure */ +SQFS_API sqfs_dir_entry_t *sqfs_meta_reader_read_dir_ent(sqfs_meta_reader_t *m); + +/* Inode can be freed with a single free() call. + The function internally prints error message to stderr on failure. */ +SQFS_API +sqfs_inode_generic_t *sqfs_meta_reader_read_inode(sqfs_meta_reader_t *ir, + sqfs_super_t *super, + uint64_t block_start, + size_t offset); + #ifdef __cplusplus } #endif diff --git a/include/sqfs/meta_writer.h b/include/sqfs/meta_writer.h index 669b98e..9cd1598 100644 --- a/include/sqfs/meta_writer.h +++ b/include/sqfs/meta_writer.h @@ -45,6 +45,9 @@ SQFS_API void sqfs_meta_writer_reset(sqfs_meta_writer_t *m); returns non-zero on failure. */ SQFS_API int sqfs_meta_write_write_to_file(sqfs_meta_writer_t *m); +SQFS_API int sqfs_meta_writer_write_inode(sqfs_meta_writer_t *iw, + sqfs_inode_generic_t *n); + #ifdef __cplusplus } #endif -- cgit v1.2.3