Changeset 6afc9d7 in mainline for uspace/srv

Timestamp:

2015-10-06T19:01:36Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0328987

Parents:

f1f7584

Message:

UNIX-like I/O functions should use errno to return error code for many reasons.

Location:

uspace/srv

Files:

• devman/driver.c (modified) (1 diff)
• devman/match.c (modified) (3 diffs)
• loader/main.c (modified) (1 diff)
• vfs/vfs.c (modified) (1 diff)
• vfs/vfs.h (modified) (1 diff)
• vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/devman/driver.c

@@ -142 +142 @@
         /* Check whether the driver's binary exists. */
         struct stat s;
-        if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
+        if (stat(drv->binary_path, &s) != 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Driver not found at path `%s'.",
                     drv->binary_path);

uspace/srv/devman/match.c

@@ -31 +31 @@
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <io/log.h>
@@ -197 +198 @@
         if (fd < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
-                    conf_path, str_error(fd));
+                    conf_path, str_error(errno));
                 goto cleanup;
         }
@@ -217 +218 @@
         }
         
-        ssize_t read_bytes = read_all(fd, buf, len);
+        ssize_t read_bytes = read(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
-                    read_bytes);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%d).", conf_path,
+                    errno);
                 goto cleanup;
         }

uspace/srv/loader/main.c

@@ -249 +249 @@
                 }
                 async_state_change_finalize(callid, vfs_exch);
-                fd = fd_wait();
+                fd = vfs_fd_wait();
                 assert(fd == (int) filc);
         }

uspace/srv/vfs/vfs.c

@@ -74 +74 @@
                         break;
                 case VFS_IN_MOUNT:
-                        vfs_mount(callid, &call);
+                        vfs_mount_srv(callid, &call);
                         break;
                 case VFS_IN_UNMOUNT:
-                        vfs_unmount(callid, &call);
+                        vfs_unmount_srv(callid, &call);
                         break;
                 case VFS_IN_OPEN:

uspace/srv/vfs/vfs.h

@@ -205 +205 @@
 
 extern void vfs_register(ipc_callid_t, ipc_call_t *);
-extern void vfs_mount(ipc_callid_t, ipc_call_t *);
-extern void vfs_unmount(ipc_callid_t, ipc_call_t *);
+extern void vfs_mount_srv(ipc_callid_t, ipc_call_t *);
+extern void vfs_unmount_srv(ipc_callid_t, ipc_call_t *);
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
 extern void vfs_sync(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_ops.c

@@ -266 +266 @@
 }
 
-void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
+void vfs_mount_srv(ipc_callid_t rid, ipc_call_t *request)
 {
         service_id_t service_id;
@@ -405 +405 @@
 }
 
-void vfs_unmount(ipc_callid_t rid, ipc_call_t *request)
+void vfs_unmount_srv(ipc_callid_t rid, ipc_call_t *request)
 {
         int rc;