aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-05 17:00:57 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-05 17:00:57 +0200
commitd5f89c52d219332c48a46aa297bb4896e8c159aa (patch)
tree23ff58002556e9880373b4285029d38cc0c1ccae /include
parent6391ed9a18caf89ade24c05083569c66d8daa33b (diff)
Cleanup: unify sqfs/SQFS name prefix for xattr reader
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'include')
-rw-r--r--include/highlevel.h2
-rw-r--r--include/sqfs/xattr.h31
2 files changed, 17 insertions, 16 deletions
diff --git a/include/highlevel.h b/include/highlevel.h
index 18bbded..cb0c5d0 100644
--- a/include/highlevel.h
+++ b/include/highlevel.h
@@ -112,7 +112,7 @@ int compressor_cfg_init_options(compressor_config_t *cfg, E_SQFS_COMPRESSOR id,
void compressor_print_help(E_SQFS_COMPRESSOR id);
-int xattr_reader_restore_node(xattr_reader_t *xr, fstree_t *fs,
+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,
diff --git a/include/sqfs/xattr.h b/include/sqfs/xattr.h
index 92fdbfe..fb855f5 100644
--- a/include/sqfs/xattr.h
+++ b/include/sqfs/xattr.h
@@ -16,12 +16,12 @@
#include <stddef.h>
typedef enum {
- SQUASHFS_XATTR_USER = 0,
- SQUASHFS_XATTR_TRUSTED = 1,
- SQUASHFS_XATTR_SECURITY = 2,
+ SQFS_XATTR_USER = 0,
+ SQFS_XATTR_TRUSTED = 1,
+ SQFS_XATTR_SECURITY = 2,
- SQUASHFS_XATTR_FLAG_OOL = 0x100,
- SQUASHFS_XATTR_PREFIX_MASK = 0xFF,
+ SQFS_XATTR_FLAG_OOL = 0x100,
+ SQFS_XATTR_PREFIX_MASK = 0xFF,
} E_SQFS_XATTR_TYPE;
typedef struct {
@@ -47,7 +47,7 @@ typedef struct {
uint32_t unused;
} sqfs_xattr_id_table_t;
-typedef struct xattr_reader_t xattr_reader_t;
+typedef struct sqfs_xattr_reader_t sqfs_xattr_reader_t;
#ifdef __cplusplus
extern "C" {
@@ -62,20 +62,21 @@ int sqfs_get_xattr_prefix_id(const char *key);
/* Check if a given xattr key can be encoded in squashfs at all. */
bool sqfs_has_xattr(const char *key);
-void xattr_reader_destroy(xattr_reader_t *xr);
+void sqfs_xattr_reader_destroy(sqfs_xattr_reader_t *xr);
-xattr_reader_t *xattr_reader_create(int sqfsfd, sqfs_super_t *super,
- compressor_t *cmp);
+sqfs_xattr_reader_t *sqfs_xattr_reader_create(int sqfsfd, sqfs_super_t *super,
+ compressor_t *cmp);
-int xattr_reader_get_desc(xattr_reader_t *xr, uint32_t idx,
- sqfs_xattr_id_t *desc);
+int sqfs_xattr_reader_get_desc(sqfs_xattr_reader_t *xr, uint32_t idx,
+ sqfs_xattr_id_t *desc);
-int xattr_reader_seek_kv(xattr_reader_t *xr, const sqfs_xattr_id_t *desc);
+int sqfs_xattr_reader_seek_kv(sqfs_xattr_reader_t *xr,
+ const sqfs_xattr_id_t *desc);
-sqfs_xattr_value_t *xattr_reader_read_value(xattr_reader_t *xr,
- const sqfs_xattr_entry_t *key);
+sqfs_xattr_value_t *sqfs_xattr_reader_read_value(sqfs_xattr_reader_t *xr,
+ const sqfs_xattr_entry_t *key);
-sqfs_xattr_entry_t *xattr_reader_read_key(xattr_reader_t *xr);
+sqfs_xattr_entry_t *sqfs_xattr_reader_read_key(sqfs_xattr_reader_t *xr);
#ifdef __cplusplus
}