From 5acb22a6a7168f8b961777482f39a125158def50 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 5 Mar 2020 15:17:45 +0100 Subject: Cleanup: Remove the E_ prefix from all libsquashfs enumerators Avoid namespace polution. Make sure all exportet symbols are prefixed with either sqfs_ or SQFS_. Signed-off-by: David Oberhollenzer --- lib/sqfs/comp/compressor.c | 6 +++--- lib/sqfs/super.c | 2 +- lib/sqfs/xattr.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/sqfs') diff --git a/lib/sqfs/comp/compressor.c b/lib/sqfs/comp/compressor.c index 0b4bf25..28de2c5 100644 --- a/lib/sqfs/comp/compressor.c +++ b/lib/sqfs/comp/compressor.c @@ -73,7 +73,7 @@ int sqfs_generic_read_options(sqfs_file_t *file, void *data, size_t size) return 0; } -bool sqfs_compressor_exists(E_SQFS_COMPRESSOR id) +bool sqfs_compressor_exists(SQFS_COMPRESSOR id) { if (id < SQFS_COMP_MIN || id > SQFS_COMP_MAX) return false; @@ -122,7 +122,7 @@ sqfs_compressor_t *sqfs_compressor_create(const sqfs_compressor_config_t *cfg) return compressors[cfg->id](cfg); } -const char *sqfs_compressor_name_from_id(E_SQFS_COMPRESSOR id) +const char *sqfs_compressor_name_from_id(SQFS_COMPRESSOR id) { if (id < 0 || (size_t)id >= sizeof(names) / sizeof(names[0])) return NULL; @@ -143,7 +143,7 @@ int sqfs_compressor_id_from_name(const char *name) } int sqfs_compressor_config_init(sqfs_compressor_config_t *cfg, - E_SQFS_COMPRESSOR id, + SQFS_COMPRESSOR id, size_t block_size, sqfs_u16 flags) { sqfs_u32 flag_mask = SQFS_COMP_FLAG_GENERIC_ALL; diff --git a/lib/sqfs/super.c b/lib/sqfs/super.c index 4ed95ae..c5b6fe9 100644 --- a/lib/sqfs/super.c +++ b/lib/sqfs/super.c @@ -13,7 +13,7 @@ #include int sqfs_super_init(sqfs_super_t *super, size_t block_size, sqfs_u32 mtime, - E_SQFS_COMPRESSOR compressor) + SQFS_COMPRESSOR compressor) { unsigned int i; diff --git a/lib/sqfs/xattr.c b/lib/sqfs/xattr.c index 909a9a5..29ecebf 100644 --- a/lib/sqfs/xattr.c +++ b/lib/sqfs/xattr.c @@ -13,7 +13,7 @@ static const struct { const char *prefix; - E_SQFS_XATTR_TYPE type; + SQFS_XATTR_TYPE type; } xattr_types[] = { { "user.", SQFS_XATTR_USER }, { "trusted.", SQFS_XATTR_TRUSTED }, @@ -36,7 +36,7 @@ int sqfs_get_xattr_prefix_id(const char *key) return SQFS_ERROR_UNSUPPORTED; } -const char *sqfs_get_xattr_prefix(E_SQFS_XATTR_TYPE id) +const char *sqfs_get_xattr_prefix(SQFS_XATTR_TYPE id) { size_t i; -- cgit v1.2.3