erofs-utils: improve compatibility and reduce header conflicts
PATCH 1/1 erofs-utils: improve compatibility and reduce header conflicts
Adjusted the initialization of union in erofs-utils to ensure compatibility with various compilers. The original C99 designated initializer style was not supported in other compilers (e.g., C++11), causing build issues. In addition, modified the code to reduce potential conflicts with headers from other projects.
Signed-off-by Hongzhen Luo <[email protected]>
--- include/erofs/defs.h | 4 ++-- include/erofs/internal.h | 2 +- include/erofs_fs.h | 4 +++- lib/compress.c | 2 +- lib/inode.c | 2 +- lib/io.c | 12 ++++++------ lib/kite_deflate.c | 2 +- lib/tar.c | 4 ++-- 8 files changed, 17 insertions(+), 15 deletions(-)
include/erofs/defs.h +2 -2
@@ -343,8 +343,8 @@ unsigned long __roundup_pow_of_two(unsigned long n)#define ST_MTIM_NSEC (stbuf) 0#endif -#define likely (x) __builtin_expect(!!(x), 1) -#define unlikely (x) __builtin_expect(!!(x), 0) +#define __erofs_likely (x) __builtin_expect(!!(x), 1) +#define __erofs_unlikely (x) __builtin_expect(!!(x), 0) #ifdef __cplusplus }
include/erofs/internal.h +1 -1
@@ -301,7 +301,7 @@ static inline unsigned int erofs_inode_datalayout(unsigned int value)static inline struct erofs_inode *erofs_parent_inode (struct erofs_inode *inode) { -return (void *)((unsigned long )inode->i_parent & ~1UL ); +return (struct erofs_inode *)((unsigned long )inode->i_parent & ~1UL ); }#define IS_ROOT (x) ((x) == erofs_parent_inode(x))
include/erofs_fs.h +3 -1
@@ -454,7 +454,9 @@ static inline void erofs_check_ondisk_layout_definitions(void)struct z_erofs_map_header h;__le64 v; } fmh __maybe_unused = { - .h.h_clusterbits =1 <<Z_EROFS_FRAGMENT_INODE_BIT , + .h = { + .h_clusterbits =1 <<Z_EROFS_FRAGMENT_INODE_BIT , + }, };BUILD_BUG_ON (sizeof (struct erofs_super_block ) !=128 );
lib/compress.c +1 -1
@@ -1197,7 +1197,7 @@ int z_erofs_mt_wq_tls_init_compr(struct erofs_sb_info *sbi,struct erofs_compress_cfg *lc = &tls->ccfg[alg_id];int ret; -if (likely (lc->enable)) +if (__erofs_likely (lc->enable))return 0 ; ret = erofs_compressor_init(sbi, &lc->handle, alg_name,
lib/inode.c +1 -1
@@ -323,7 +323,7 @@ erofs_nid_t erofs_lookupnid(struct erofs_inode *inode)erofs_dbg ("Assign nid %llu to file %s (mode %05o)" , inode->nid, inode->i_srcpath, inode->i_mode); } -if (unlikely (IS_ROOT (inode)) && inode->nid >0xffff ) +if (__erofs_unlikely (IS_ROOT (inode)) && inode->nid >0xffff )return sbi->root_nid;return inode->nid; }
lib/io.c +6 -6
@@ -28,7 +28,7 @@int erofs_io_fstat (struct erofs_vfile *vf,struct stat *buf) { -if (unlikely (cfg.c_dry_run)) { +if (__erofs_unlikely (cfg.c_dry_run)) { buf->st_size =0 ; buf->st_mode =S_IFREG |0777 ;return 0 ;
@@ -44,7 +44,7 @@ ssize_t erofs_io_pwrite(struct erofs_vfile *vf, const void *buf, {ssize_t ret, written =0 ; -if (unlikely (cfg.c_dry_run)) +if (__erofs_unlikely (cfg.c_dry_run))return 0 ;if (vf->ops)
@@ -78,7 +78,7 @@ int erofs_io_fsync(struct erofs_vfile *vf) {int ret; -if (unlikely (cfg.c_dry_run)) +if (__erofs_unlikely (cfg.c_dry_run))return 0 ;if (vf->ops)
@@ -98,7 +98,7 @@ ssize_t erofs_io_fallocate(struct erofs_vfile *vf, u64 offset,static const char zero[EROFS_MAX_BLOCK_SIZE ] = {0 };ssize_t ret; -if (unlikely (cfg.c_dry_run)) +if (__erofs_unlikely (cfg.c_dry_run))return 0 ;if (vf->ops)
@@ -124,7 +124,7 @@ int erofs_io_ftruncate(struct erofs_vfile *vf, u64 length)int ret;struct stat st; -if (unlikely (cfg.c_dry_run)) +if (__erofs_unlikely (cfg.c_dry_run))return 0 ;if (vf->ops)
@@ -145,7 +145,7 @@ ssize_t erofs_io_pread(struct erofs_vfile *vf, void *buf, u64 pos, size_t len) {ssize_t ret, read =0 ; -if (unlikely (cfg.c_dry_run)) +if (__erofs_unlikely (cfg.c_dry_run))return 0 ;if (vf->ops)
lib/kite_deflate.c +1 -1
@@ -866,7 +866,7 @@ static void kite_mf_reset(struct kite_matchfinder *mf,* * [1] https://github.com/tukaani-project/xz/blob/v5.4.0/src/liblzma/lz/lz_encoder_mf.c#L94 */ -if (unlikely (mf->base > ((typeof (mf->base))-1 ) >>1 )) { +if (__erofs_unlikely (mf->base > ((typeof (mf->base))-1 ) >>1 )) { mf->base = kHistorySize32 +1 ;memset (mf->hash,0 ,0x10000 *sizeof (mf->hash[0 ])); }
lib/tar.c +2 -2
@@ -202,7 +202,7 @@ int erofs_iostream_read(struct erofs_iostream *ios, void **buf, u64 bytes)if (ret < ios->bufsize - rabytes) ios->feof = true; } -if (unlikely (ios->dumpfd >=0 )) +if (__erofs_unlikely (ios->dumpfd >=0 ))if (write (ios->dumpfd, ios->buffer + rabytes, ret) < ret)erofs_err ("failed to dump %d bytes of the raw stream: %s" , ret,erofs_strerror (-errno));
@@ -246,7 +246,7 @@ int erofs_iostream_lskip(struct erofs_iostream *ios, u64 sz)if (ios->feof)return sz; -if (ios->sz &&likely (ios->dumpfd <0 )) { +if (ios->sz &&__erofs_likely (ios->dumpfd <0 )) {s64 cur =erofs_io_lseek (&ios->vf, sz,SEEK_CUR );if (cur > ios->sz)
Signature · 1 line
2.39.3