Changeset 6ad454f in mainline for uspace/srv/vfs/vfs_file.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:

a8c7a6d

Parents:

9246016

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 06:01:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Pass file handles separately from error codes.

File:

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

uspace/srv/vfs/vfs_file.c

@@ -192 +192 @@
 }
 
-static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
+static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc, int *out_fd)
 {
         if (!vfs_files_init(vfs_data))
@@ -223 +223 @@
                         
                         fibril_mutex_unlock(&vfs_data->lock);
-                        return (int) i;
+                        *out_fd = (int) i;
+                        return EOK;
                 }
                 
@@ -249 +250 @@
  *             in a descending order.
  *
- * @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);
+ * @param[out] out_fd  First available file descriptor
+ *
+ * @return Error code.
+ */
+int vfs_fd_alloc(vfs_file_t **file, bool desc, int *out_fd)
+{
+        return _vfs_fd_alloc(VFS_DATA, file, desc, out_fd);
 }
 
@@ -427 +429 @@
 }
 
-int vfs_wait_handle_internal(bool high_fd)
+int vfs_wait_handle_internal(bool high_fd, int *out_fd)
 {
         vfs_client_data_t *vfs_data = VFS_DATA; 
@@ -441 +443 @@
 
         vfs_file_t *file;
-        int fd = _vfs_fd_alloc(vfs_data, &file, high_fd);
-        if (fd < 0) {
+        int rc = _vfs_fd_alloc(vfs_data, &file, high_fd, out_fd);
+        if (rc != EOK) {
                 vfs_node_delref(bh->node);
                 free(bh);
-                return fd;
+                return rc;
         }
         
@@ -452 +454 @@
         vfs_file_put(file);
         free(bh);
-        return fd;
+        return EOK;
 }