Changes in uspace/srv/vfs/vfs_file.c [40feeac:b7fd2a0] 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 int _vfs_fd_free(vfs_client_data_t *, int);
+static errno_t _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 int vfs_file_close_remote(vfs_file_t *file)
+static errno_t vfs_file_close_remote(vfs_file_t *file)
 {
         assert(!file->refcnt);
@@ -145 +145 @@
         vfs_exchange_release(exch);
         
-        sysarg_t rc;
+        errno_t rc;
         async_wait_for(msg, &rc);
         
-        return IPC_GET_ARG1(answer);
+        return IPC_GET_RETVAL(answer);
 }
 
@@ -168 +168 @@
  *                      decremented.
  */
-static int vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file)
-{
-        int rc = EOK;
+static errno_t vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file)
+{
+        errno_t rc = EOK;
 
         assert(fibril_mutex_is_locked(&vfs_data->lock));
@@ -192 +192 @@
 }
 
-static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, vfs_file_t **file, bool desc)
+static errno_t _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);
-}
-
-static int _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
+ * @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)
 {
         if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) {
@@ -263 +265 @@
         }
 
-        int rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
+        errno_t rc = vfs_file_delref(vfs_data, vfs_data->files[fd]);
         vfs_data->files[fd] = NULL;
         return rc;
 }
 
-static int _vfs_fd_free(vfs_client_data_t *vfs_data, int fd)
-{
-        int rc;
+static errno_t _vfs_fd_free(vfs_client_data_t *vfs_data, int fd)
+{
+        errno_t rc;
 
         if (!vfs_files_init(vfs_data))
@@ -289 +291 @@
  *                      descriptor.
  */
-int vfs_fd_free(int fd)
+errno_t vfs_fd_free(int fd)
 {
         return _vfs_fd_free(VFS_DATA, fd);
@@ -303 +305 @@
  *
  */
-int vfs_fd_assign(vfs_file_t *file, int fd)
+errno_t vfs_fd_assign(vfs_file_t *file, int fd)
 {
         if (!vfs_files_init(VFS_DATA))
@@ -427 +429 @@
 }
 
-int vfs_wait_handle_internal(bool high_fd)
+errno_t 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) {
+        errno_t 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;
 }