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

uspace/srv/fs/locfs/locfs_ops.c

@@ -39 +39 @@
 #include <stdbool.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <libfs.h>
@@ -590 +590 @@
                 
                 /* Wait for reply from the driver. */
-                sysarg_t rc;
+                int rc;
                 async_wait_for(msg, &rc);
 
@@ -654 +654 @@
                 
                 /* Wait for reply from the driver. */
-                sysarg_t rc;
+                int rc;
                 async_wait_for(msg, &rc);
 
@@ -752 +752 @@
                 
                 /* Wait for reply from the driver */
-                sysarg_t rc;
+                int rc;
                 async_wait_for(msg, &rc);