Changeset f77c1c9 in mainline for uspace/lib/pcut/src/os/helenos.c

Timestamp:

2017-12-08T21:03:35Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c19a5a59

Parents:

c1694b6b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 19:44:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Return VFS handles separately from error codes.

File:

• uspace/lib/pcut/src/os/helenos.c (modified) (2 diffs)

uspace/lib/pcut/src/os/helenos.c

@@ -159 +159 @@
         char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
         snprintf(tempfile_name, PCUT_TEMP_FILENAME_BUFFER_SIZE - 1, "pcut_%lld.tmp", (unsigned long long) task_get_id());
-        int tempfile = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE);
-        if (tempfile < 0) {
+        int tempfile;
+        int rc = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE, &tempfile);
+        if (rc != EOK) {
                 pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, "Failed to create temporary file.", NULL, NULL);
                 return PCUT_OUTCOME_INTERNAL_ERROR;
@@ -177 +178 @@
 
         task_wait_t test_task_wait;
-        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
+        rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
             fileno(stdin), tempfile, tempfile);
         if (rc != EOK) {