Merge pull request #25 from xqyjlj/fix-unuse-dev

🐞 fix: fix unuse

include/ext4_misc.h

@@ -133,11 +133,11 @@ static inline uint16_t reorder16(uint16_t n)
     while (0)
 
 #ifdef __GNUC__
- #ifndef __unused
- #define __unused __attribute__ ((__unused__))
+ #ifndef __ext4_unused // "__unused" conflicts with riscv`s include/bits/signal.h
+ #define __ext4_unused __attribute__ ((__unused__))
  #endif
 #else
- #define __unused
+ #define __ext4_unused
 #endif
 
 #ifndef offsetof

include/misc/tree.h

@@ -385,7 +385,7 @@ struct {                                \
 #define RB_PROTOTYPE(name, type, field, cmp)                \
     RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
 #define RB_PROTOTYPE_STATIC(name, type, field, cmp)         \
-    RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static)
+    RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __ext4_unused static)
 #define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)     \
     RB_PROTOTYPE_INSERT_COLOR(name, type, attr);            \
     RB_PROTOTYPE_REMOVE_COLOR(name, type, attr);            \
@@ -421,7 +421,7 @@ struct {                                \
 #define RB_GENERATE(name, type, field, cmp)             \
     RB_GENERATE_INTERNAL(name, type, field, cmp,)
 #define RB_GENERATE_STATIC(name, type, field, cmp)          \
-    RB_GENERATE_INTERNAL(name, type, field, cmp, __unused static)
+    RB_GENERATE_INTERNAL(name, type, field, cmp, __ext4_unused static)
 #define RB_GENERATE_INTERNAL(name, type, field, cmp, attr)      \
     RB_GENERATE_INSERT_COLOR(name, type, field, attr)       \
     RB_GENERATE_REMOVE_COLOR(name, type, field, attr)       \

src/ext4.c

@@ -424,7 +424,7 @@ static struct ext4_mountpoint *ext4_get_mount(const char *path)
     return mp;
 }
 
-__unused
+__ext4_unused
 static int __ext4_journal_start(const char *mount_point)
 {
     int r = EOK;
@@ -455,7 +455,7 @@ Finish:
     return r;
 }
 
-__unused
+__ext4_unused
 static int __ext4_journal_stop(const char *mount_point)
 {
     int r = EOK;
@@ -492,7 +492,7 @@ Finish:
     return r;
 }
 
-__unused
+__ext4_unused
 static int __ext4_recover(const char *mount_point)
 {
     struct ext4_mountpoint *mp = ext4_get_mount(mount_point);
@@ -550,7 +550,7 @@ Finish:
     return r;
 }
 
-__unused
+__ext4_unused
 static int __ext4_trans_start(struct ext4_mountpoint *mp)
 {
     int r = EOK;
@@ -569,7 +569,7 @@ Finish:
     return r;
 }
 
-__unused
+__ext4_unused
 static int __ext4_trans_stop(struct ext4_mountpoint *mp)
 {
     int r = EOK;
@@ -583,7 +583,7 @@ static int __ext4_trans_stop(struct ext4_mountpoint *mp)
     return r;
 }
 
-__unused
+__ext4_unused
 static void __ext4_trans_abort(struct ext4_mountpoint *mp)
 {
     if (mp->fs.jbd_journal && mp->fs.curr_trans) {
@@ -594,7 +594,7 @@ static void __ext4_trans_abort(struct ext4_mountpoint *mp)
     }
 }
 
-int ext4_journal_start(const char *mount_point __unused)
+int ext4_journal_start(const char *mount_point __ext4_unused)
 {
     int r = EOK;
 #if CONFIG_JOURNALING_ENABLE
@@ -603,7 +603,7 @@ int ext4_journal_start(const char *mount_point __unused)
     return r;
 }
 
-int ext4_journal_stop(const char *mount_point __unused)
+int ext4_journal_stop(const char *mount_point __ext4_unused)
 {
     int r = EOK;
 #if CONFIG_JOURNALING_ENABLE
@@ -612,7 +612,7 @@ int ext4_journal_stop(const char *mount_point __unused)
     return r;
 }
 
-int ext4_recover(const char *mount_point __unused)
+int ext4_recover(const char *mount_point __ext4_unused)
 {
     int r = EOK;
 #if CONFIG_JOURNALING_ENABLE
@@ -621,7 +621,7 @@ int ext4_recover(const char *mount_point __unused)
     return r;
 }
 
-static int ext4_trans_start(struct ext4_mountpoint *mp __unused)
+static int ext4_trans_start(struct ext4_mountpoint *mp __ext4_unused)
 {
     int r = EOK;
 #if CONFIG_JOURNALING_ENABLE
@@ -630,7 +630,7 @@ static int ext4_trans_start(struct ext4_mountpoint *mp __unused)
     return r;
 }
 
-static int ext4_trans_stop(struct ext4_mountpoint *mp __unused)
+static int ext4_trans_stop(struct ext4_mountpoint *mp __ext4_unused)
 {
     int r = EOK;
 #if CONFIG_JOURNALING_ENABLE
@@ -639,7 +639,7 @@ static int ext4_trans_stop(struct ext4_mountpoint *mp __unused)
     return r;
 }
 
-static void ext4_trans_abort(struct ext4_mountpoint *mp __unused)
+static void ext4_trans_abort(struct ext4_mountpoint *mp __ext4_unused)
 {
 #if CONFIG_JOURNALING_ENABLE
     __ext4_trans_abort(mp);

src/ext4_balloc.c

@@ -105,7 +105,7 @@ static uint32_t ext4_balloc_bitmap_csum(struct ext4_sblock *sb,
 
 void ext4_balloc_set_bitmap_csum(struct ext4_sblock *sb,
                  struct ext4_bgroup *bg,
-                 void *bitmap __unused)
+                 void *bitmap __ext4_unused)
 {
     int desc_size = ext4_sb_get_desc_size(sb);
     uint32_t checksum = ext4_balloc_bitmap_csum(sb, bitmap);
@@ -126,7 +126,7 @@ void ext4_balloc_set_bitmap_csum(struct ext4_sblock *sb,
 static bool
 ext4_balloc_verify_bitmap_csum(struct ext4_sblock *sb,
                    struct ext4_bgroup *bg,
-                   void *bitmap __unused)
+                   void *bitmap __ext4_unused)
 {
     int desc_size = ext4_sb_get_desc_size(sb);
     uint32_t checksum = ext4_balloc_bitmap_csum(sb, bitmap);

src/ext4_dir.c

@@ -114,7 +114,7 @@ bool ext4_dir_csum_verify(struct ext4_inode_ref *inode_ref,
             return false;
         }
 
-        ptrdiff_t __unused diff = (char *)t - (char *)dirent;
+        ptrdiff_t __ext4_unused diff = (char *)t - (char *)dirent;
         uint32_t csum = ext4_dir_csum(inode_ref, dirent, diff);
         if (t->checksum != to_le32(csum))
             return false;
@@ -145,7 +145,7 @@ void ext4_dir_set_csum(struct ext4_inode_ref *inode_ref,
             return;
         }
 
-        ptrdiff_t __unused diff = (char *)t - (char *)dirent;
+        ptrdiff_t __ext4_unused diff = (char *)t - (char *)dirent;
         uint32_t csum = ext4_dir_csum(inode_ref, dirent, diff);
         t->checksum = to_le32(csum);
     }

src/ext4_dir_idx.c

@@ -862,7 +862,7 @@ static int ext4_dir_dx_entry_comparator(const void *arg1, const void *arg2)
  *
  */
 static void
-ext4_dir_dx_insert_entry(struct ext4_inode_ref *inode_ref __unused,
+ext4_dir_dx_insert_entry(struct ext4_inode_ref *inode_ref __ext4_unused,
              struct ext4_dir_idx_block *index_block,
              uint32_t hash, uint32_t iblock)
 {

src/ext4_extent.c

@@ -495,7 +495,7 @@ static int ext4_allocate_single_block(struct ext4_inode_ref *inode_ref,
 
 static ext4_fsblk_t ext4_new_meta_blocks(struct ext4_inode_ref *inode_ref,
                      ext4_fsblk_t goal,
-                     uint32_t flags __unused,
+                     uint32_t flags __ext4_unused,
                      uint32_t *count, int *errp)
 {
     ext4_fsblk_t block = 0;
@@ -508,7 +508,7 @@ static ext4_fsblk_t ext4_new_meta_blocks(struct ext4_inode_ref *inode_ref,
 
 static void ext4_ext_free_blocks(struct ext4_inode_ref *inode_ref,
                  ext4_fsblk_t block, uint32_t count,
-                 uint32_t flags __unused)
+                 uint32_t flags __ext4_unused)
 {
     ext4_balloc_free_blocks(inode_ref, block, count);
 }
@@ -680,7 +680,7 @@ static uint32_t ext4_ext_block_csum(struct ext4_inode_ref *inode_ref,
 #endif
 
 static void
-ext4_extent_block_csum_set(struct ext4_inode_ref *inode_ref __unused,
+ext4_extent_block_csum_set(struct ext4_inode_ref *inode_ref __ext4_unused,
                struct ext4_extent_header *eh)
 {
     struct ext4_extent_tail *tail;
@@ -729,7 +729,7 @@ static void ext4_ext_drop_refs(struct ext4_inode_ref *inode_ref,
  */
 static int ext4_ext_check(struct ext4_inode_ref *inode_ref,
               struct ext4_extent_header *eh, uint16_t depth,
-              ext4_fsblk_t pblk __unused)
+              ext4_fsblk_t pblk __ext4_unused)
 {
     struct ext4_extent_tail *tail;
     struct ext4_sblock *sb = &inode_ref->fs->sb;
@@ -776,7 +776,7 @@ corrupted:
 static int read_extent_tree_block(struct ext4_inode_ref *inode_ref,
                   ext4_fsblk_t pblk, int32_t depth,
                   struct ext4_block *bh,
-                  uint32_t flags __unused)
+                  uint32_t flags __ext4_unused)
 {
     int err;
 
@@ -1985,7 +1985,7 @@ static int ext4_ext_zero_unwritten_range(struct ext4_inode_ref *inode_ref,
     return err;
 }
 
-__unused static void print_path(struct ext4_extent_path *path)
+__ext4_unused static void print_path(struct ext4_extent_path *path)
 {
     int32_t i = path->depth;
     while (i >= 0) {

src/ext4_fs.c

@@ -1346,7 +1346,7 @@ int ext4_fs_indirect_find_goal(struct ext4_inode_ref *inode_ref,
 static int ext4_fs_get_inode_dblk_idx_internal(struct ext4_inode_ref *inode_ref,
                        ext4_lblk_t iblock, ext4_fsblk_t *fblock,
                        bool extent_create,
-                       bool support_unwritten __unused)
+                       bool support_unwritten __ext4_unused)
 {
     struct ext4_fs *fs = inode_ref->fs;
 

src/ext4_ialloc.c

@@ -111,7 +111,7 @@ static uint32_t ext4_ialloc_bitmap_csum(struct ext4_sblock *sb, void *bitmap)
 #endif
 
 void ext4_ialloc_set_bitmap_csum(struct ext4_sblock *sb, struct ext4_bgroup *bg,
-                 void *bitmap __unused)
+                 void *bitmap __ext4_unused)
 {
     int desc_size = ext4_sb_get_desc_size(sb);
     uint32_t csum = ext4_ialloc_bitmap_csum(sb, bitmap);
@@ -131,7 +131,7 @@ void ext4_ialloc_set_bitmap_csum(struct ext4_sblock *sb, struct ext4_bgroup *bg,
 #if CONFIG_META_CSUM_ENABLE
 static bool
 ext4_ialloc_verify_bitmap_csum(struct ext4_sblock *sb, struct ext4_bgroup *bg,
-                   void *bitmap __unused)
+                   void *bitmap __ext4_unused)
 {
 
     int desc_size = ext4_sb_get_desc_size(sb);

src/ext4_journal.c

@@ -1305,8 +1305,8 @@ int jbd_journal_start(struct jbd_fs *jbd_fs,
     return EOK;
 }
 
-static void jbd_trans_end_write(struct ext4_bcache *bc __unused,
-              struct ext4_buf *buf __unused,
+static void jbd_trans_end_write(struct ext4_bcache *bc __ext4_unused,
+              struct ext4_buf *buf __ext4_unused,
               int res,
               void *arg);
 
@@ -2098,7 +2098,7 @@ void jbd_journal_cp_trans(struct jbd_journal *journal, struct jbd_trans *trans)
 
 /**@brief  Update the start block of the journal when
  *         all the contents in a transaction reach the disk.*/
-static void jbd_trans_end_write(struct ext4_bcache *bc __unused,
+static void jbd_trans_end_write(struct ext4_bcache *bc __ext4_unused,
               struct ext4_buf *buf,
               int res,
               void *arg)

src/ext4_trans.c

@@ -86,8 +86,8 @@ int ext4_trans_block_get(struct ext4_blockdev *bdev,
     return r;
 }
 
-int ext4_trans_try_revoke_block(struct ext4_blockdev *bdev __unused,
-                    uint64_t lba __unused)
+int ext4_trans_try_revoke_block(struct ext4_blockdev *bdev __ext4_unused,
+                    uint64_t lba __ext4_unused)
 {
     int r = EOK;
 #if CONFIG_JOURNALING_ENABLE

src/ext4_xattr.c

@@ -207,7 +207,7 @@ static uint32_t ext4_xattr_block_checksum(struct ext4_inode_ref *inode_ref,
 #endif
 
 static void ext4_xattr_set_block_checksum(struct ext4_inode_ref *inode_ref,
-                      ext4_fsblk_t blocknr __unused,
+                      ext4_fsblk_t blocknr __ext4_unused,
                       struct ext4_xattr_header *header)
 {
     struct ext4_sblock *sb = &inode_ref->fs->sb;