Changeset f77c1c9 in mainline for uspace/srv/devman/match.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/srv/devman/match.c (modified) (2 diffs)

uspace/srv/devman/match.c

@@ -202 +202 @@
         struct stat st;
         
-        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
-        if (fd < 0) {
+        int rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
+        if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
-                    conf_path, str_error(errno));
+                    conf_path, str_error(rc));
                 goto cleanup;
         }
         opened = true;
         
-        if (vfs_stat(fd, &st) != EOK) {
+        rc = vfs_stat(fd, &st);
+        if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to fstat %d: %s.", fd,
-                    str_error(errno));
+                    str_error(rc));
                 goto cleanup;
         }
@@ -230 +231 @@
         
         size_t read_bytes;
-        int rc = vfs_read(fd, (aoff64_t []) {0}, buf, len, &read_bytes);
+        rc = vfs_read(fd, (aoff64_t []) {0}, buf, len, &read_bytes);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s': %s.", conf_path,
-                    str_error(errno));
+                    str_error(rc));
                 goto cleanup;
         }