Cleanup: add sqfs_* prefix to id table

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

2 files changed, 16 insertions, 15 deletions

diff --git a/include/highlevel.h b/include/highlevel.h
index cb0c5d0..701754a 100644
--- a/include/highlevel.h
+++ b/include/highlevel.h
@@ -53,7 +53,7 @@ enum RDTREE_FLAGS {
   Returns 0 on success. Prints error messages to stderr on failure.
  */
 int sqfs_serialize_fstree(int outfd, sqfs_super_t *super, fstree_t *fs,
-			  compressor_t *cmp, id_table_t *idtbl);
+			  compressor_t *cmp, sqfs_id_table_t *idtbl);
 
 /*
   Convert a generic squashfs tree node to an fstree_t node.
@@ -61,7 +61,7 @@ int sqfs_serialize_fstree(int outfd, sqfs_super_t *super, fstree_t *fs,
   Prints error messages to stderr on failure.
  */
 tree_node_t *tree_node_from_inode(sqfs_inode_generic_t *inode,
-				  const id_table_t *idtbl,
+				  const sqfs_id_table_t *idtbl,
 				  const char *name,
 				  size_t block_size);
 
@@ -115,7 +115,7 @@ void compressor_print_help(E_SQFS_COMPRESSOR id);
 int xattr_reader_restore_node(sqfs_xattr_reader_t *xr, fstree_t *fs,
 			      tree_node_t *node, uint32_t xattr);
 
-sqfs_inode_generic_t *tree_node_to_inode(fstree_t *fs, id_table_t *idtbl,
+sqfs_inode_generic_t *tree_node_to_inode(fstree_t *fs, sqfs_id_table_t *idtbl,
 					 tree_node_t *node);
 
 #endif /* HIGHLEVEL_H */
diff --git a/include/sqfs/id_table.h b/include/sqfs/id_table.h
index 951c55e..65e77bc 100644
--- a/include/sqfs/id_table.h
+++ b/include/sqfs/id_table.h
@@ -4,8 +4,8 @@
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#ifndef ID_TABLE_H
-#define ID_TABLE_H
+#ifndef SQFS_ID_TABLE_H
+#define SQFS_ID_TABLE_H
 
 #include "config.h"
 
@@ -14,35 +14,36 @@
 
 #include "compress.h"
 
-typedef struct id_table_t id_table_t;
+typedef struct sqfs_id_table_t sqfs_id_table_t;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Prints error message to stderr on failure. */
-id_table_t *id_table_create(void);
+sqfs_id_table_t *sqfs_id_table_create(void);
 
-void id_table_destroy(id_table_t *tbl);
+void sqfs_id_table_destroy(sqfs_id_table_t *tbl);
 
 /* Resolve a 32 bit to a 16 bit table index.
    Returns 0 on success. Internally prints errors to stderr. */
-int id_table_id_to_index(id_table_t *tbl, uint32_t id, uint16_t *out);
+int sqfs_id_table_id_to_index(sqfs_id_table_t *tbl, uint32_t id, uint16_t *out);
 
 /* Write an ID table to a SquashFS image.
    Returns 0 on success. Internally prints error message to stderr. */
-int id_table_write(id_table_t *tbl, int outfd, sqfs_super_t *super,
-		   compressor_t *cmp);
+int sqfs_id_table_write(sqfs_id_table_t *tbl, int outfd, sqfs_super_t *super,
+			compressor_t *cmp);
 
 /* Read an ID table from a SquashFS image.
    Returns 0 on success. Internally prints error messages to stderr. */
-int id_table_read(id_table_t *tbl, int fd, sqfs_super_t *super,
-		  compressor_t *cmp);
+int sqfs_id_table_read(sqfs_id_table_t *tbl, int fd, sqfs_super_t *super,
+		       compressor_t *cmp);
 
-int id_table_index_to_id(const id_table_t *tbl, uint16_t index, uint32_t *out);
+int sqfs_id_table_index_to_id(const sqfs_id_table_t *tbl, uint16_t index,
+			      uint32_t *out);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ID_TABLE_H */
+#endif /* SQFS_ID_TABLE_H */