Changes in uspace/srv/vfs/vfs_file.c [b7fd2a0:40feeac] in mainline

File:

• uspace/srv/vfs/vfs_file.c (modified) (13 diffs)

uspace/srv/vfs/vfs_file.c

@@ -64 +64 @@
 } vfs_boxed_handle_t;
 
-static errno_t _vfs_fd_free(vfs_client_data_t *, int);
+static int _vfs_fd_free(vfs_client_data_t *, int);
 
 /** Initialize the table of open files. */
@@ -133 +133 @@
 
 /** Close the file in the endpoint FS server. */
-static errno_t vfs_file_close_remote(vfs_file_t *file)
+static int vfs_file_close_remote(vfs_file_t *file)
 {
         assert(!file->refcnt);
@@ -145 +145 @@
         vfs_exchange_release(exch);
         
-        errno_t rc;
+        sysarg_t rc;
         async_wait_for(msg, &rc);
         
-        return IPC_GET_RETVAL(answer);
+        return IPC_GET_ARG1(answer);
 }
 
@@ -168 +168 @@
  *                      decremented.
  */
-static errno_t vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file)
-{
-        errno_t rc = EOK;
+static int vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file)
+{
+        int rc = EOK;
 
         assert(fibril_mutex_is_locked(&vfs_data->lock));
@@ -192 +192 @@
 }
 
-static errno_t _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc, int *out_fd)
+static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
 {
         if (!vfs_files_init(vfs_data))
@@ -223 +223 @@
                         
                         fibril_mutex_unlock(&vfs_data->lock);
-                        *out_fd = (int) i;
-                        return EOK;
+                        return (int) i;
                 }
                 
@@ -250 +249 @@
  *             in a descending order.
  *
- * @param[out] out_fd  First available file descriptor
- *
- * @return Error code.
- */
-errno_t vfs_fd_alloc(vfs_file_t **file, bool desc, int *out_fd)
-{
-        return _vfs_fd_alloc(VFS_DATA, file, desc, out_fd);
-}
-
-static errno_t _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
+ * @return First available file descriptor or a negative error
+ *         code.
+ */
+int vfs_fd_alloc(vfs_file_t **file, bool desc)
+{
+        return _vfs_fd_alloc(VFS_DATA, file, desc);
+}
+
+static int _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
 {
         if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) {
@@ -265 +263 @@
         }
 
-        errno_t rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
+        int rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
         vfs_data->files[fd] = NULL;
         return rc;
 }
 
-static errno_t _vfs_fd_free(vfs_client_data_t *vfs_data, int fd)
-{
-        errno_t rc;
+static int _vfs_fd_free(vfs_client_data_t *vfs_data, int fd)
+{
+        int rc;
 
         if (!vfs_files_init(vfs_data))
@@ -291 +289 @@
  *                      descriptor.
  */
-errno_t vfs_fd_free(int fd)
+int vfs_fd_free(int fd)
 {
         return _vfs_fd_free(VFS_DATA, fd);
@@ -305 +303 @@
  *
  */
-errno_t vfs_fd_assign(vfs_file_t *file, int fd)
+int vfs_fd_assign(vfs_file_t *file, int fd)
 {
         if (!vfs_files_init(VFS_DATA))
@@ -429 +427 @@
 }
 
-errno_t vfs_wait_handle_internal(bool high_fd, int *out_fd)
+int vfs_wait_handle_internal(bool high_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
@@ -443 +441 @@
 
         vfs_file_t *file;
-        errno_t rc = _vfs_fd_alloc(vfs_data, &file, high_fd, out_fd);
-        if (rc != EOK) {
+        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
+        if (fd < 0) {
                 vfs_node_delref(bh->node);
                 free(bh);
-                return rc;
+                return fd;
         }
         
@@ -454 +452 @@
         vfs_file_put(file);
         free(bh);
-        return EOK;
+        return fd;
 }