diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-03-05 15:17:45 +0100 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-03-05 15:17:45 +0100 |
commit | 5acb22a6a7168f8b961777482f39a125158def50 (patch) | |
tree | 24e7b46a2b69a938fc7906bc690c652a1aeab269 /lib | |
parent | fbf41ac14978c93d054832af6331e6795fb86b0f (diff) |
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 <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/common/comp_opt.c | 4 | ||||
-rw-r--r-- | lib/common/compress.c | 2 | ||||
-rw-r--r-- | lib/sqfs/comp/compressor.c | 6 | ||||
-rw-r--r-- | lib/sqfs/super.c | 2 | ||||
-rw-r--r-- | lib/sqfs/xattr.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/lib/common/comp_opt.c b/lib/common/comp_opt.c index 66d562e..58a7a21 100644 --- a/lib/common/comp_opt.c +++ b/lib/common/comp_opt.c @@ -89,7 +89,7 @@ static char *const token[] = { }; int compressor_cfg_init_options(sqfs_compressor_config_t *cfg, - E_SQFS_COMPRESSOR id, + SQFS_COMPRESSOR id, size_t block_size, char *options) { size_t num_flags = 0, min_level = 0, max_level = 0, level, dict_size; @@ -332,7 +332,7 @@ static const compressor_help_fun_t helpfuns[SQFS_COMP_MAX + 1] = { [SQFS_COMP_ZSTD] = zstd_print_help, }; -void compressor_print_help(E_SQFS_COMPRESSOR id) +void compressor_print_help(SQFS_COMPRESSOR id) { if (id < SQFS_COMP_MIN || id > SQFS_COMP_MAX) return; diff --git a/lib/common/compress.c b/lib/common/compress.c index a2f53c2..3ee242d 100644 --- a/lib/common/compress.c +++ b/lib/common/compress.c @@ -6,7 +6,7 @@ */ #include "common.h" -E_SQFS_COMPRESSOR compressor_get_default(void) +SQFS_COMPRESSOR compressor_get_default(void) { if (sqfs_compressor_exists(SQFS_COMP_XZ)) return SQFS_COMP_XZ; 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 <string.h> 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; |