Changeset 5a6cc679 in mainline for uspace/srv/fs/mfs/mfs_dentry.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/srv/fs/mfs/mfs_dentry.c (modified) (6 diffs)

uspace/srv/fs/mfs/mfs_dentry.c

@@ -42 +42 @@
  * @return              EOK on success or an error code.
  */
-int
+errno_t
 mfs_read_dentry(struct mfs_node *mnode,
     struct mfs_dentry_info *d_info, unsigned index)
@@ -52 +52 @@
         block_t *b;
 
-        int r = mfs_read_map(&block, mnode, index * sbi->dirsize);
+        errno_t r = mfs_read_map(&block, mnode, index * sbi->dirsize);
         if (r != EOK)
                 goto out_err;
@@ -105 +105 @@
  * @return       EOK on success or an error code.
  */
-int
+errno_t
 mfs_write_dentry(struct mfs_dentry_info *d_info)
 {
@@ -114 +114 @@
         block_t *b;
         uint32_t block;
-        int r;
+        errno_t r;
 
         r = mfs_read_map(&block, mnode, d_off_bytes);
@@ -156 +156 @@
  * @return              EOK on success or an error code.
  */
-int
+errno_t
 mfs_remove_dentry(struct mfs_node *mnode, const char *d_name)
 {
         struct mfs_sb_info *sbi = mnode->instance->sbi;
         struct mfs_dentry_info d_info;
-        int r;
+        errno_t r;
 
         const size_t name_len = str_size(d_name);
@@ -197 +197 @@
  * @return              EOK on success or an error code.
  */
-int
+errno_t
 mfs_insert_dentry(struct mfs_node *mnode, const char *d_name,
     fs_index_t d_inum)
 {
-        int r;
+        errno_t r;
         struct mfs_sb_info *sbi = mnode->instance->sbi;
         struct mfs_dentry_info d_info;