Changeset d5c1051 in mainline for uspace/srv/fs

Timestamp:

2017-12-20T22:25:34Z (8 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:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

Location:

uspace/srv/fs

Files:

• exfat/exfat_directory.c (modified) (4 diffs)
• mfs/mfs_inode.c (modified) (4 diffs)
• mfs/mfs_rw.c (modified) (1 diff)

uspace/srv/fs/exfat/exfat_directory.c

@@ -218 +218 @@
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
         exfat_dentry_t *d = NULL;
-        int rc, i;
+        int rc;
+        int i;
         size_t offset = 0;
         aoff64_t start_pos = 0;
@@ -305 +306 @@
     exfat_stream_dentry_t *ds)
 {
-        int rc, i, count;
+        int rc;
+        int i, count;
         exfat_dentry_t *array = NULL, *de;
         aoff64_t pos = di->pos;
@@ -372 +374 @@
         exfat_dentry_t df, ds, *de;
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
-        int rc, i;
+        int rc;
+        int i;
         size_t uctable_chars, j;
         aoff64_t pos;
@@ -473 +476 @@
 int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)
 {
-        int rc, count;
+        int rc;
+        int count;
         exfat_dentry_t *de;
 

uspace/srv/fs/mfs/mfs_inode.c

@@ -83 +83 @@
         struct mfs_sb_info *sbi;
         block_t *b;
-        int i, r;
+        int i;
+        int r;
 
         sbi = instance->sbi;
@@ -142 +143 @@
         struct mfs_sb_info *sbi;
         block_t *b;
-        int i, r;
+        int i;
+        int r;
 
         ino_i = malloc(sizeof(*ino_i));
@@ -224 +226 @@
 mfs_write_inode_raw(struct mfs_node *mnode)
 {
-        int i, r;
+        int i;
+        int r;
         block_t *b;
         struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -270 +273 @@
         struct mfs_sb_info *sbi = mnode->instance->sbi;
         block_t *b;
-        int i, r;
+        int i;
+        int r;
 
         const uint32_t inum = ino_i->index - 1;

uspace/srv/fs/mfs/mfs_rw.c

@@ -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;