Changeset b7fd2a0 in mainline for uspace/srv/fs/mfs/mfs_rw.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/srv/fs/mfs/mfs_rw.c (modified) (11 diffs)

uspace/srv/fs/mfs/mfs_rw.c

@@ -34 +34 @@
 #include "mfs.h"
 
-static int
+static errno_t
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
     bool write_mode, uint32_t w_block);
 
-static int
+static errno_t
 reset_zone_content(struct mfs_instance *inst, uint32_t zone);
 
-static int
+static errno_t
 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone);
 
-static int
+static errno_t
 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone);
 
-static int
+static errno_t
 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone);
 
@@ -61 +61 @@
  * @return      EOK on success or an error code.
  */
-int
+errno_t
 mfs_read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos)
 {
-        int r;
+        errno_t r;
         const struct mfs_sb_info *sbi = mnode->instance->sbi;
         const int block_size = sbi->block_size;
@@ -83 +83 @@
 }
 
-int
+errno_t
 mfs_write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone,
     uint32_t *old_zone)
@@ -100 +100 @@
 }
 
-static int
+static errno_t
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
     bool write_mode, uint32_t w_block)
@@ -107 +107 @@
         int ptrs_per_block;
         uint32_t *ind_zone = NULL, *ind2_zone = NULL;
-        int r = EOK;
+        errno_t r = EOK;
 
         struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -238 +238 @@
  * @return              EOK on success or an error code.
  */
-int
+errno_t
 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size)
 {
@@ -245 +245 @@
         struct mfs_ino_info *ino_i = mnode->ino_i;
         int nr_direct, ptrs_per_block, rblock;
-        int r;
+        errno_t r;
         int i;
 
@@ -312 +312 @@
 }
 
-static int
+static errno_t
 reset_zone_content(struct mfs_instance *inst, uint32_t zone)
 {
         block_t *b;
-        int r;
+        errno_t r;
 
         r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD);
@@ -328 +328 @@
 }
 
-static int
+static errno_t
 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone)
 {
-        int r;
+        errno_t r;
 
         r = mfs_alloc_zone(inst, zone);
@@ -341 +341 @@
 }
 
-static int
+static errno_t
 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone)
 {
         struct mfs_sb_info *sbi = inst->sbi;
-        int r;
+        errno_t r;
         unsigned i;
         block_t *b;
@@ -376 +376 @@
 }
 
-static int
+static errno_t
 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone)
 {
         struct mfs_sb_info *sbi = inst->sbi;
-        int r;
+        errno_t r;
         unsigned i;
         block_t *b;