Changeset 132ab5d1 in mainline for uspace/srv/logger/ctl.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/logger/ctl.c (modified) (2 diffs)

uspace/srv/logger/ctl.c

@@ -35 +35 @@
  */
 
-#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <io/logctl.h>
@@ -87 +87 @@
                 }
                 case LOGGER_CONTROL_SET_ROOT: {
-                        int fd = vfs_receive_handle(true);
-                        vfs_root_set(fd);
-                        async_answer_0(callid, fd >= 0 ? EOK : fd);
+                        int fd;
+                        int rc = vfs_receive_handle(true, &fd);
+                        if (rc == EOK) {
+                                rc = vfs_root_set(fd);
+                                vfs_put(fd);
+                        }
+                        async_answer_0(callid, rc);
                         break;
                 }