WebSVN – HelenOS – Path Comparison – / – /trunk/ Rev 3214 and /trunk/ Rev 3215

Ignore whitespace Rev 3214 → Rev 3215

 /trunk/uspace/srv/vfs/vfs_ops.c
 ,12 → 374,8
 void vfs_close(ipc_callid_t rid, ipc_call_t *request)
 {
     int fd = IPC_GET_ARG1(*request);
-    if (fd >= MAX_OPEN_FILES) {
-        ipc_answer_0(rid, EBADF);
-        return;
-    }
-    vfs_fd_free(fd);
-    ipc_answer_0(rid, EOK);
+    int rc = vfs_fd_free(fd);
+    ipc_answer_0(rid, rc);
 }
 static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)

 /trunk/uspace/srv/vfs/vfs.h
 ,7 → 282,7
 extern bool vfs_files_init(void);
 extern vfs_file_t *vfs_file_get(int);
 extern int vfs_fd_alloc(void);
-extern void vfs_fd_free(int);
+extern int vfs_fd_free(int);
 extern void vfs_file_addref(vfs_file_t *);
 extern void vfs_file_delref(vfs_file_t *);

 /trunk/uspace/srv/vfs/vfs_file.c
 ,13 → 97,17
 /** Release file descriptor.
  *
  * @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;
 }
 /** Increment reference count of VFS file structure.