Changes in uspace/srv/devman/match.c [39330200:9af1c61] in mainline

File:

• uspace/srv/devman/match.c (modified) (2 diffs)

uspace/srv/devman/match.c

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