Cleanup: add sqfs_* prefix to meta reader

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

3 files changed, 20 insertions, 18 deletions

diff --git a/include/sqfs/dir.h b/include/sqfs/dir.h
index 22f8a57..c57831c 100644
--- a/include/sqfs/dir.h
+++ b/include/sqfs/dir.h
@@ -44,11 +44,12 @@ extern "C" {
 #endif
 
 /* Returns 0 on success. Internally prints to stderr on failure */
-int meta_reader_read_dir_header(meta_reader_t *m, sqfs_dir_header_t *hdr);
+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_dir_entry_t *meta_reader_read_dir_ent(meta_reader_t *m);
+sqfs_dir_entry_t *sqfs_meta_reader_read_dir_ent(sqfs_meta_reader_t *m);
 
 sqfs_dir_writer_t *sqfs_dir_writer_create(sqfs_meta_writer_t *dm);
 
diff --git a/include/sqfs/inode.h b/include/sqfs/inode.h
index 20c8fa2..d693aec 100644
--- a/include/sqfs/inode.h
+++ b/include/sqfs/inode.h
@@ -138,10 +138,10 @@ extern "C" {
 
 /* Inode can be freed with a single free() call.
    The function internally prints error message to stderr on failure. */
-sqfs_inode_generic_t *meta_reader_read_inode(meta_reader_t *ir,
-					     sqfs_super_t *super,
-					     uint64_t block_start,
-					     size_t offset);
+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);
 
 int sqfs_meta_writer_write_inode(sqfs_meta_writer_t *iw,
 				 sqfs_inode_generic_t *n);
diff --git a/include/sqfs/meta_reader.h b/include/sqfs/meta_reader.h
index ab9f46d..1517e67 100644
--- a/include/sqfs/meta_reader.h
+++ b/include/sqfs/meta_reader.h
@@ -4,15 +4,15 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#ifndef META_READER_H
-#define META_READER_H
+#ifndef SQFS_META_READER_H
+#define SQFS_META_READER_H
 
 #include "config.h"
 
 #include "sqfs/compress.h"
 #include "sqfs/data.h"
 
-typedef struct meta_reader_t meta_reader_t;
+typedef struct sqfs_meta_reader_t sqfs_meta_reader_t;
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,23 +24,24 @@ extern "C" {
    Start offset and limit can be specified to do bounds checking against
    a subregion of the filesystem image.
 */
-meta_reader_t *meta_reader_create(int fd, compressor_t *cmp,
-				  uint64_t start, uint64_t limit);
+sqfs_meta_reader_t *sqfs_meta_reader_create(int fd, compressor_t *cmp,
+					    uint64_t start, uint64_t limit);
 
-void meta_reader_destroy(meta_reader_t *m);
+void sqfs_meta_reader_destroy(sqfs_meta_reader_t *m);
 
 /* Returns 0 on success. Internally prints to stderr on failure */
-int meta_reader_seek(meta_reader_t *m, uint64_t block_start,
-		     size_t offset);
+int sqfs_meta_reader_seek(sqfs_meta_reader_t *m, uint64_t block_start,
+			  size_t offset);
 
-void meta_reader_get_position(meta_reader_t *m, uint64_t *block_start,
-			      size_t *offset);
+void sqfs_meta_reader_get_position(sqfs_meta_reader_t *m,
+				   uint64_t *block_start,
+				   size_t *offset);
 
 /* Returns 0 on success. Internally prints to stderr on failure */
-int meta_reader_read(meta_reader_t *m, void *data, size_t size);
+int sqfs_meta_reader_read(sqfs_meta_reader_t *m, void *data, size_t size);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* META_READER_H */
+#endif /* SQFS_META_READER_H */