Changeset b7fd2a0 in mainline for uspace/lib/ext4/src/balloc.c

Timestamp:

2018-01-13T03:10:29Z (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:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

• uspace/lib/ext4/src/balloc.c (modified) (11 diffs)

uspace/lib/ext4/src/balloc.c

@@ -53 +53 @@
  *
  */
-int ext4_balloc_free_block(ext4_inode_ref_t *inode_ref, uint32_t block_addr)
+errno_t ext4_balloc_free_block(ext4_inode_ref_t *inode_ref, uint32_t block_addr)
 {
         ext4_filesystem_t *fs = inode_ref->fs;
@@ -65 +65 @@
         /* Load block group reference */
         ext4_block_group_ref_t *bg_ref;
-        int rc = ext4_filesystem_get_block_group_ref(fs, block_group, &bg_ref);
+        errno_t rc = ext4_filesystem_get_block_group_ref(fs, block_group, &bg_ref);
         if (rc != EOK)
                 return rc;
@@ -118 +118 @@
 }
 
-static int ext4_balloc_free_blocks_internal(ext4_inode_ref_t *inode_ref,
+static errno_t ext4_balloc_free_blocks_internal(ext4_inode_ref_t *inode_ref,
     uint32_t first, uint32_t count)
 {
@@ -134 +134 @@
         /* Load block group reference */
         ext4_block_group_ref_t *bg_ref;
-        int rc = ext4_filesystem_get_block_group_ref(fs, block_group_first, &bg_ref);
+        errno_t rc = ext4_filesystem_get_block_group_ref(fs, block_group_first, &bg_ref);
         if (rc != EOK)
                 return rc;
@@ -198 +198 @@
  *
  */
-int ext4_balloc_free_blocks(ext4_inode_ref_t *inode_ref,
+errno_t ext4_balloc_free_blocks(ext4_inode_ref_t *inode_ref,
     uint32_t first, uint32_t count)
 {
-        int r;
+        errno_t r;
         uint32_t gid;
         uint64_t limit;
@@ -293 +293 @@
  *
  */
-static int ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref, uint32_t *goal)
+static errno_t ext4_balloc_find_goal(ext4_inode_ref_t *inode_ref, uint32_t *goal)
 {
         *goal = 0;
@@ -307 +307 @@
         /* If inode has some blocks, get last block address + 1 */
         if (inode_block_count > 0) {
-                int rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
+                errno_t rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
                     inode_block_count - 1, goal);
                 if (rc != EOK)
@@ -325 +325 @@
         /* Load block group reference */
         ext4_block_group_ref_t *bg_ref;
-        int rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
+        errno_t rc = ext4_filesystem_get_block_group_ref(inode_ref->fs,
             block_group, &bg_ref);
         if (rc != EOK)
@@ -343 +343 @@
  *
  */
-int ext4_balloc_alloc_block(ext4_inode_ref_t *inode_ref, uint32_t *fblock)
+errno_t ext4_balloc_alloc_block(ext4_inode_ref_t *inode_ref, uint32_t *fblock)
 {
         uint32_t allocated_block = 0;
@@ -354 +354 @@
         
         /* Find GOAL */
-        int rc = ext4_balloc_find_goal(inode_ref, &goal);
+        errno_t rc = ext4_balloc_find_goal(inode_ref, &goal);
         if (rc != EOK)
                 return rc;
@@ -625 +625 @@
  *
  */
-int ext4_balloc_try_alloc_block(ext4_inode_ref_t *inode_ref, uint32_t fblock,
+errno_t ext4_balloc_try_alloc_block(ext4_inode_ref_t *inode_ref, uint32_t fblock,
     bool *free)
 {
-        int rc;
+        errno_t rc;
         
         ext4_filesystem_t *fs = inode_ref->fs;