Changeset 1569a9b in mainline for uspace/srv/fs

Timestamp:

2017-12-24T16:40:33Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

48fd597

Parents:

a1026da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-24 16:40:33)

git-committer:

GitHub <noreply@…> (2017-12-24 16:40:33)

Message:

The "not-so-obvious" error handling tweaks. (#9)

Some more changes to enable type-checking with errno_t. Some of the "fixes" here don't quite feel right, but a proper solution would be a more elaborate refactoring of the surrounding code.

Location:

uspace/srv/fs/mfs

Files:

• mfs.c (modified) (2 diffs)
• mfs_balloc.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs.c

@@ -68 +68 @@
                 else {
                         printf(NAME " Unrecognized parameters");
-                        rc = -1;
+                        rc = EINVAL;
                         goto err;
                 }
@@ -78 +78 @@
         if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");
-                return -1;
+                rc = errno;
+                goto err;
         }
 

uspace/srv/fs/mfs/mfs_balloc.c

@@ -246 +246 @@
                         printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
-                        return -1;
+                        return EIO;
                 }
         } else {
@@ -254 +254 @@
                         printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
-                        return -1;
+                        return EIO;
                 }
         }
@@ -303 +303 @@
         unsigned *search, i, start_block;
         unsigned bits_per_block;
-        int r, freebit;
+        int r;
+        int freebit;
 
         sbi = inst->sbi;