Changeset 132ab5d1 in mainline for uspace/srv/devman/match.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/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;
         }
@@ -229 +230 @@
         }
         
-        ssize_t read_bytes = vfs_read(fd, (aoff64_t []) {0}, buf, len);
-        if (read_bytes <= 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%d).", conf_path,
-                    errno);
+        size_t 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(rc));
                 goto cleanup;
         }