Changeset a35b458 in mainline for uspace/lib/ext4/src/superblock.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/lib/ext4/src/superblock.c (modified) (17 diffs)

uspace/lib/ext4/src/superblock.c

@@ -241 +241 @@
         uint32_t log = 0;
         uint32_t tmp = size / EXT4_MIN_BLOCK_SIZE;
-        
+
         tmp >>= 1;
         while (tmp) {
@@ -247 +247 @@
                 tmp >>= 1;
         }
-        
+
         ext4_superblock_set_log_block_size(sb, log);
 }
@@ -297 +297 @@
         uint32_t log = 0;
         uint32_t tmp = size / EXT4_MIN_BLOCK_SIZE;
-        
+
         tmp >>= 1;
         while (tmp) {
@@ -303 +303 @@
                 tmp >>= 1;
         }
-        
+
         ext4_superblock_set_log_frag_size(sb, log);
 }
@@ -736 +736 @@
         if (ext4_superblock_get_rev_level(sb) == 0)
                 return EXT4_REV0_INODE_SIZE;
-        
+
         return uint16_t_le2host(sb->inode_size);
 }
@@ -1001 +1001 @@
 {
         uint16_t size = uint16_t_le2host(sb->desc_size);
-        
+
         if (size < EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE)
                 size = EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE;
-        
+
         return size;
 }
@@ -1021 +1021 @@
                 sb->desc_size =
                     host2uint16_t_le(EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE);
-        
+
         sb->desc_size = host2uint16_t_le(size);
 }
@@ -1064 +1064 @@
         if (ext4_superblock_get_flags(sb) & flag)
                 return true;
-        
+
         return false;
 }
@@ -1081 +1081 @@
         if (ext4_superblock_get_features_compatible(sb) & feature)
                 return true;
-        
+
         return false;
 }
@@ -1098 +1098 @@
         if (ext4_superblock_get_features_incompatible(sb) & feature)
                 return true;
-        
+
         return false;
 }
@@ -1115 +1115 @@
         if (ext4_superblock_get_features_read_only(sb) & feature)
                 return true;
-        
+
         return false;
 }
@@ -1133 +1133 @@
         if (data == NULL)
                 return ENOMEM;
-        
+
         /* Read data from block device */
         errno_t rc = block_read_bytes_direct(service_id, EXT4_SUPERBLOCK_OFFSET,
             EXT4_SUPERBLOCK_SIZE, data);
-        
+
         if (rc != EOK) {
                 free(data);
                 return rc;
         }
-        
+
         /* Set output value */
         (*sb) = data;
-        
+
         return EOK;
 }
@@ -1164 +1164 @@
         if (rc != EOK)
                 return rc;
-        
+
         /* Compute address of the first block */
         uint64_t first_block = EXT4_SUPERBLOCK_OFFSET / phys_block_size;
-        
+
         /* Compute number of block to write */
         size_t block_count = EXT4_SUPERBLOCK_SIZE / phys_block_size;
-        
+
         /* Check alignment */
         if (EXT4_SUPERBLOCK_SIZE % phys_block_size)
                 block_count++;
-        
+
         /* Write data */
         return block_write_direct(service_id, first_block, block_count, sb);
@@ -1203 +1203 @@
         if (ext4_superblock_get_magic(sb) != EXT4_SUPERBLOCK_MAGIC)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_inodes_count(sb) == 0)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_blocks_count(sb) == 0)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_blocks_per_group(sb) == 0)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_inodes_per_group(sb) == 0)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_inode_size(sb) < 128)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_first_inode(sb) < 11)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_desc_size(sb) <
             EXT4_MIN_BLOCK_GROUP_DESCRIPTOR_SIZE)
                 return ENOTSUP;
-        
+
         if (ext4_superblock_get_desc_size(sb) >
             EXT4_MAX_BLOCK_GROUP_DESCRIPTOR_SIZE)
                 return ENOTSUP;
-        
+
         return EOK;
 }
@@ -1244 +1244 @@
         uint64_t blocks_count = ext4_superblock_get_blocks_count(sb);
         uint32_t blocks_per_group = ext4_superblock_get_blocks_per_group(sb);
-        
+
         uint32_t block_groups_count = blocks_count / blocks_per_group;
-        
+
         if (blocks_count % blocks_per_group)
                 block_groups_count++;
-        
+
         return block_groups_count;
 }
@@ -1269 +1269 @@
         uint64_t total_blocks =
             ext4_superblock_get_blocks_count(sb);
-        
+
         if (bgid < block_group_count - 1)
                 return blocks_per_group;
@@ -1292 +1292 @@
         uint32_t total_inodes =
             ext4_superblock_get_inodes_count(sb);
-        
+
         if (bgid < block_group_count - 1)
                 return inodes_per_group;