Changeset b7f9087 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2008-07-07T13:07:11Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c98e6ee

Parents:

412a31e

Message:

Instead of aborting or crashing, return EBADF when an invalid file descriptor
is passed to vfs_close().

File:

• uspace/srv/vfs/vfs_file.c (modified) (1 diff)

uspace/srv/vfs/vfs_file.c

@@ -98 +98 @@
  *
  * @param fd            File descriptor being released.
+ *
+ * @return              EOK on success or EBADF if fd is an invalid file
+ *                      descriptor.
  */
-void vfs_fd_free(int fd)
+int vfs_fd_free(int fd)
 {
-        assert(fd < MAX_OPEN_FILES);
-        assert(files[fd] != NULL);
+        if ((fd >= MAX_OPEN_FILES) || (files[fd] == NULL))
+                return EBADF;
         vfs_file_delref(files[fd]);
         files[fd] = NULL;
+        return EOK;
 }