Changeset b7fd2a0 in mainline for uspace/lib/ext4/src/directory_index.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/directory_index.c (modified) (11 diffs)

uspace/lib/ext4/src/directory_index.c

@@ -236 +236 @@
  *
  */
-int ext4_directory_dx_init(ext4_inode_ref_t *dir)
+errno_t ext4_directory_dx_init(ext4_inode_ref_t *dir)
 {
         /* Load block 0, where will be index root located */
         uint32_t fblock;
-        int rc = ext4_filesystem_get_inode_data_block_index(dir, 0,
+        errno_t rc = ext4_filesystem_get_inode_data_block_index(dir, 0,
             &fblock);
         if (rc != EOK)
@@ -322 +322 @@
  *
  */
-static int ext4_directory_hinfo_init(ext4_hash_info_t *hinfo,
+static errno_t ext4_directory_hinfo_init(ext4_hash_info_t *hinfo,
     block_t *root_block, ext4_superblock_t *sb, size_t name_len,
     const char *name)
@@ -384 +384 @@
  *
  */
-static int ext4_directory_dx_get_leaf(ext4_hash_info_t *hinfo,
+static errno_t ext4_directory_dx_get_leaf(ext4_hash_info_t *hinfo,
     ext4_inode_ref_t *inode_ref, block_t *root_block,
     ext4_directory_dx_block_t **dx_block, ext4_directory_dx_block_t *dx_blocks)
@@ -443 +443 @@
                 
                 uint32_t fblock;
-                int rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
+                errno_t rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
                     next_block, &fblock);
                 if (rc != EOK)
@@ -484 +484 @@
  *
  */
-static int ext4_directory_dx_next_block(ext4_inode_ref_t *inode_ref,
+static errno_t ext4_directory_dx_next_block(ext4_inode_ref_t *inode_ref,
     uint32_t hash, ext4_directory_dx_block_t *dx_block,
     ext4_directory_dx_block_t *dx_blocks)
@@ -520 +520 @@
                 uint32_t block_addr;
                 
-                int rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
+                errno_t rc = ext4_filesystem_get_inode_data_block_index(inode_ref,
                     block_idx, &block_addr);
                 if (rc != EOK)
@@ -556 +556 @@
  *
  */
-int ext4_directory_dx_find_entry(ext4_directory_search_result_t *result,
+errno_t ext4_directory_dx_find_entry(ext4_directory_search_result_t *result,
     ext4_inode_ref_t *inode_ref, size_t name_len, const char *name)
 {
         /* Load direct block 0 (index root) */
         uint32_t root_block_addr;
-        int rc2;
-        int rc = ext4_filesystem_get_inode_data_block_index(inode_ref, 0,
+        errno_t rc2;
+        errno_t rc = ext4_filesystem_get_inode_data_block_index(inode_ref, 0,
             &root_block_addr);
         if (rc != EOK)
@@ -728 +728 @@
  *
  */
-static int ext4_directory_dx_split_data(ext4_inode_ref_t *inode_ref,
+static errno_t ext4_directory_dx_split_data(ext4_inode_ref_t *inode_ref,
     ext4_hash_info_t *hinfo, block_t *old_data_block,
     ext4_directory_dx_block_t *index_block, block_t **new_data_block)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
         
         /* Allocate buffer for directory entries */
@@ -897 +897 @@
  *
  */
-static int ext4_directory_dx_split_index(ext4_inode_ref_t *inode_ref,
+static errno_t ext4_directory_dx_split_index(ext4_inode_ref_t *inode_ref,
                 ext4_directory_dx_block_t *dx_blocks, ext4_directory_dx_block_t *dx_block)
 {
@@ -937 +937 @@
                 uint32_t new_fblock;
                 uint32_t new_iblock;
-                int rc = ext4_filesystem_append_inode_block(inode_ref,
+                errno_t rc = ext4_filesystem_append_inode_block(inode_ref,
                     &new_fblock, &new_iblock);
                 if (rc != EOK)
@@ -1045 +1045 @@
  *
  */
-int ext4_directory_dx_add_entry(ext4_inode_ref_t *parent,
+errno_t ext4_directory_dx_add_entry(ext4_inode_ref_t *parent,
     ext4_inode_ref_t *child, const char *name)
 {
-        int rc2 = EOK;
+        errno_t rc2 = EOK;
         
         /* Get direct block 0 (index root) */
         uint32_t root_block_addr;
-        int rc = ext4_filesystem_get_inode_data_block_index(parent, 0,
+        errno_t rc = ext4_filesystem_get_inode_data_block_index(parent, 0,
             &root_block_addr);
         if (rc != EOK)