Changeset 132ab5d1 in mainline for uspace/srv/fs/mfs/mfs_rw.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/fs/mfs/mfs_rw.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs_rw.c

@@ -59 +59 @@
  * @param pos   Position in file.
  *
- * @return      EOK on success or a negative error code.
+ * @return      EOK on success or an error code.
  */
 int
@@ -236 +236 @@
  * @param new_size      The new size of the inode.
  *
- * @return              EOK on success or a negative error code.
+ * @return              EOK on success or an error code.
  */
 int
@@ -244 +244 @@
         struct mfs_sb_info *sbi = inst->sbi;
         struct mfs_ino_info *ino_i = mnode->ino_i;
-        int nr_direct, ptrs_per_block, rblock, r;
+        int nr_direct, ptrs_per_block, rblock;
+        int r;
         int i;