Changeset 132ab5d1 in mainline for uspace/app/tester/mm/pager1.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/app/tester/mm/pager1.c (modified) (2 diffs)

uspace/app/tester/mm/pager1.c

@@ -30 +30 @@
 #include <vfs/vfs.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <as.h>
 #include <ns.h>
@@ -45 +44 @@
 static void *create_paged_area(size_t size)
 {
+        size_t nwr;
+        int rc;
+
         TPRINTF("Creating temporary file...\n");
 
-        fd = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_READ | MODE_WRITE);
-        if (fd < 0)
+        rc = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE, &fd);
+        if (rc != EOK)
                 return NULL;
         (void) vfs_unlink_path(TEST_FILE);
 
-        if (vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text)) < 0) {
+        rc = vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text), &nwr);
+        if (rc != EOK) {
                 vfs_put(fd);
                 return NULL;