From c6a76b0c566f6cc4fd0d7a956cdf9739912944d7 Mon Sep 17 00:00:00 2001 From: gkostka Date: Tue, 16 Jun 2015 10:02:21 +0100 Subject: [PATCH] clang-format: ext4_block_group --- lwext4/ext4_block_group.c | 66 ++++++++++++++++++--------------------- lwext4/ext4_block_group.h | 49 +++++++++++++++-------------- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/lwext4/ext4_block_group.c b/lwext4/ext4_block_group.c index b0a5956..7426087 100644 --- a/lwext4/ext4_block_group.c +++ b/lwext4/ext4_block_group.c @@ -44,46 +44,42 @@ /**@brief CRC-16 look up table*/ static uint16_t const crc16_tab[256] = { - 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, - 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, - 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, - 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, - 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, - 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, - 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, - 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, - 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, - 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, - 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, - 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, - 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, - 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, - 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, - 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, - 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, - 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, - 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, - 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, - 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, - 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, - 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, - 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, - 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, - 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, - 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, - 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, - 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, - 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, - 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, - 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 -}; + 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 0xC601, + 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, 0xCC01, 0x0CC0, + 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, 0x0A00, 0xCAC1, 0xCB81, + 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, 0xD801, 0x18C0, 0x1980, 0xD941, + 0x1B00, 0xDBC1, 0xDA81, 0x1A40, 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, + 0x1DC0, 0x1C80, 0xDC41, 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, + 0x1680, 0xD641, 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, + 0x1040, 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, + 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, 0x3C00, + 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, 0xFA01, 0x3AC0, + 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, 0x2800, 0xE8C1, 0xE981, + 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, 0xEE01, 0x2EC0, 0x2F80, 0xEF41, + 0x2D00, 0xEDC1, 0xEC81, 0x2C40, 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, + 0xE7C1, 0xE681, 0x2640, 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, + 0x2080, 0xE041, 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, + 0x6240, 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, + 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, 0xAA01, + 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, 0x7800, 0xB8C1, + 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, 0xBE01, 0x7EC0, 0x7F80, + 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, 0xB401, 0x74C0, 0x7580, 0xB541, + 0x7700, 0xB7C1, 0xB681, 0x7640, 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, + 0x71C0, 0x7080, 0xB041, 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, + 0x5280, 0x9241, 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, + 0x5440, 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, + 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, 0x8801, + 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, 0x4E00, 0x8EC1, + 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, 0x4400, 0x84C1, 0x8581, + 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, 0x8201, 0x42C0, 0x4380, 0x8341, + 0x4100, 0x81C1, 0x8081, 0x4040}; uint16_t ext4_bg_crc16(uint16_t crc, const uint8_t *buffer, size_t len) { while (len--) - crc = (((crc >> 8) & 0xffU) ^ - crc16_tab[(crc ^ *buffer++) & 0xffU]) & 0x0000ffffU; + crc = (((crc >> 8) & 0xffU) ^ crc16_tab[(crc ^ *buffer++) & 0xffU]) & + 0x0000ffffU; return crc; } diff --git a/lwext4/ext4_block_group.h b/lwext4/ext4_block_group.h index f4e904c..e76d1ca 100644 --- a/lwext4/ext4_block_group.h +++ b/lwext4/ext4_block_group.h @@ -42,7 +42,6 @@ #ifndef EXT4_BLOCK_GROUP_H_ #define EXT4_BLOCK_GROUP_H_ - #include #include #include @@ -56,12 +55,12 @@ * @return Address of block with block bitmap */ static inline uint64_t ext4_bg_get_block_bitmap(struct ext4_bgroup *bg, - struct ext4_sblock *s) + struct ext4_sblock *s) { uint64_t v = to_le32(bg->block_bitmap_lo); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint64_t) to_le32(bg->block_bitmap_hi) << 32; + v |= (uint64_t)to_le32(bg->block_bitmap_hi) << 32; return v; } @@ -72,13 +71,13 @@ static inline uint64_t ext4_bg_get_block_bitmap(struct ext4_bgroup *bg, * @return Address of block with i-node bitmap */ static inline uint64_t ext4_bg_get_inode_bitmap(struct ext4_bgroup *bg, - struct ext4_sblock *s) + struct ext4_sblock *s) { uint64_t v = to_le32(bg->inode_bitmap_lo); - if (ext4_sb_get_desc_size(s)> EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint64_t) to_le32(bg->inode_bitmap_hi) << 32; + if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) + v |= (uint64_t)to_le32(bg->inode_bitmap_hi) << 32; return v; } @@ -88,13 +87,14 @@ static inline uint64_t ext4_bg_get_inode_bitmap(struct ext4_bgroup *bg, * @param s Pointer to superblock * @return Address of first block of i-node table */ -static inline uint64_t ext4_bg_get_inode_table_first_block( - struct ext4_bgroup *bg, struct ext4_sblock *s) +static inline uint64_t +ext4_bg_get_inode_table_first_block(struct ext4_bgroup *bg, + struct ext4_sblock *s) { uint64_t v = to_le32(bg->inode_table_first_block_lo); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint64_t) to_le32(bg->inode_table_first_block_hi) << 32; + v |= (uint64_t)to_le32(bg->inode_table_first_block_hi) << 32; return v; } @@ -105,12 +105,12 @@ static inline uint64_t ext4_bg_get_inode_table_first_block( * @return Number of free blocks in block group */ static inline uint32_t ext4_bg_get_free_blocks_count(struct ext4_bgroup *bg, - struct ext4_sblock *s) + struct ext4_sblock *s) { uint32_t v = to_le16(bg->free_blocks_count_lo); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint32_t) to_le16(bg->free_blocks_count_hi) << 16; + v |= (uint32_t)to_le16(bg->free_blocks_count_hi) << 16; return v; } @@ -121,7 +121,8 @@ static inline uint32_t ext4_bg_get_free_blocks_count(struct ext4_bgroup *bg, * @param cnt Number of free blocks in block group */ static inline void ext4_bg_set_free_blocks_count(struct ext4_bgroup *bg, - struct ext4_sblock *s, uint32_t cnt) + struct ext4_sblock *s, + uint32_t cnt) { bg->free_blocks_count_lo = to_le16((cnt << 16) >> 16); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) @@ -134,12 +135,12 @@ static inline void ext4_bg_set_free_blocks_count(struct ext4_bgroup *bg, * @return Number of free i-nodes in block group */ static inline uint32_t ext4_bg_get_free_inodes_count(struct ext4_bgroup *bg, - struct ext4_sblock *s) + struct ext4_sblock *s) { uint32_t v = to_le16(bg->free_inodes_count_lo); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint32_t) to_le16(bg->free_inodes_count_hi) << 16; + v |= (uint32_t)to_le16(bg->free_inodes_count_hi) << 16; return v; } @@ -150,7 +151,8 @@ static inline uint32_t ext4_bg_get_free_inodes_count(struct ext4_bgroup *bg, * @param cnt Number of free i-nodes in block group */ static inline void ext4_bg_set_free_inodes_count(struct ext4_bgroup *bg, - struct ext4_sblock *s, uint32_t cnt) + struct ext4_sblock *s, + uint32_t cnt) { bg->free_inodes_count_lo = to_le16((cnt << 16) >> 16); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) @@ -163,12 +165,12 @@ static inline void ext4_bg_set_free_inodes_count(struct ext4_bgroup *bg, * @return Number of used directories in block group */ static inline uint32_t ext4_bg_get_used_dirs_count(struct ext4_bgroup *bg, - struct ext4_sblock *s) + struct ext4_sblock *s) { uint32_t v = to_le16(bg->used_dirs_count_lo); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint32_t) to_le16(bg->used_dirs_count_hi) << 16; + v |= (uint32_t)to_le16(bg->used_dirs_count_hi) << 16; return v; } @@ -179,7 +181,8 @@ static inline uint32_t ext4_bg_get_used_dirs_count(struct ext4_bgroup *bg, * @param cnt Number of used directories in block group */ static inline void ext4_bg_set_used_dirs_count(struct ext4_bgroup *bg, - struct ext4_sblock *s, uint32_t cnt) + struct ext4_sblock *s, + uint32_t cnt) { bg->used_dirs_count_lo = to_le16((cnt << 16) >> 16); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) @@ -192,13 +195,13 @@ static inline void ext4_bg_set_used_dirs_count(struct ext4_bgroup *bg, * @return Number of unused i-nodes */ static inline uint32_t ext4_bg_get_itable_unused(struct ext4_bgroup *bg, - struct ext4_sblock *s) + struct ext4_sblock *s) { uint32_t v = to_le16(bg->itable_unused_lo); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) - v |= (uint32_t) to_le16(bg->itable_unused_hi) << 16; + v |= (uint32_t)to_le16(bg->itable_unused_hi) << 16; return v; } @@ -209,7 +212,8 @@ static inline uint32_t ext4_bg_get_itable_unused(struct ext4_bgroup *bg, * @param cnt Number of unused i-nodes */ static inline void ext4_bg_set_itable_unused(struct ext4_bgroup *bg, - struct ext4_sblock *s, uint32_t cnt) + struct ext4_sblock *s, + uint32_t cnt) { bg->itable_unused_lo = to_le16((cnt << 16) >> 16); if (ext4_sb_get_desc_size(s) > EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE) @@ -220,8 +224,7 @@ static inline void ext4_bg_set_itable_unused(struct ext4_bgroup *bg, * @param bg Pointer to block group * @param crc Cheksum of block group */ -static inline void ext4_bg_set_checksum(struct ext4_bgroup *bg, - uint16_t crc) +static inline void ext4_bg_set_checksum(struct ext4_bgroup *bg, uint16_t crc) { bg->checksum = to_le16(crc); } -- 2.30.2