Changeset 132ab5d1 in mainline for uspace/srv/fs/mfs/mfs.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.c (modified) (4 diffs)

uspace/srv/fs/mfs/mfs.c

@@ -44 +44 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <task.h>
 #include <stdio.h>
@@ -67 +68 @@
                 else {
                         printf(NAME " Unrecognized parameters");
-                        rc = -1;
+                        rc = EINVAL;
                         goto err;
                 }
@@ -77 +78 @@
         if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");
-                return -1;
+                rc = errno;
+                goto err;
         }
 
@@ -97 +99 @@
 
 err:
-        printf(NAME ": Failed to register file system (%d)\n", rc);
+        printf(NAME ": Failed to register file system: %s\n", str_error(rc));
         return rc;
 }