From 734893f6d2fc9044f5034b414d20b11eea49142a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 15 Jun 2004 15:18:04 +0000 Subject: [PATCH] Renamed all VFS syscalls to the new style. Improved returned types. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7963 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/vfs.h | 176 +++++++++++++++++------------------ 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/headers/private/kernel/vfs.h b/headers/private/kernel/vfs.h index 418c01e7a2..265c94788a 100755 --- a/headers/private/kernel/vfs.h +++ b/headers/private/kernel/vfs.h @@ -84,112 +84,112 @@ int vfs_set_cache_ptr(void *vnode, void *cache); status_t vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuffer, size_t bufferSize); /* calls kernel code should make for file I/O */ -int sys_mount(const char *path, const char *device, const char *fs_name, void *args); -int sys_unmount(const char *path); +status_t _kern_mount(const char *path, const char *device, const char *fs_name, void *args); +status_t _kern_unmount(const char *path); status_t _kern_read_fs_info(dev_t device, struct fs_info *info); status_t _kern_write_fs_info(dev_t device, const struct fs_info *info, int mask); -int sys_sync(void); -int sys_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode); -int sys_open(const char *path, int omode); -int sys_open_dir_node_ref(dev_t device, ino_t inode); -int sys_open_dir_entry_ref(dev_t device, ino_t inode, const char *name); -int sys_open_dir(const char *path); -int sys_fsync(int fd); -off_t sys_seek(int fd, off_t pos, int seekType); -int sys_create_entry_ref(dev_t device, ino_t inode, const char *uname, int omode, int perms); -int sys_create(const char *path, int omode, int perms); -int sys_create_dir_entry_ref(dev_t device, ino_t inode, const char *name, int perms); -int sys_create_dir(const char *path, int perms); -int sys_remove_dir(const char *path); -int sys_read_link(const char *path, char *buffer, size_t bufferSize); -int sys_write_link(const char *path, const char *toPath); -int sys_create_symlink(const char *path, const char *toPath, int mode); -int sys_create_link(const char *path, const char *toPath); -int sys_unlink(const char *path); -int sys_rename(const char *oldpath, const char *newpath); -int sys_access(const char *path, int mode); +status_t _kern_sync(void); +int _kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode); +int _kern_open(const char *path, int omode); +int _kern_open_dir_node_ref(dev_t device, ino_t inode); +int _kern_open_dir_entry_ref(dev_t device, ino_t inode, const char *name); +int _kern_open_dir(const char *path); +status_t _kern_fsync(int fd); +off_t _kern_seek(int fd, off_t pos, int seekType); +int _kern_create_entry_ref(dev_t device, ino_t inode, const char *uname, int omode, int perms); +int _kern_create(const char *path, int omode, int perms); +status_t _kern_create_dir_entry_ref(dev_t device, ino_t inode, const char *name, int perms); +status_t _kern_create_dir(const char *path, int perms); +status_t _kern_remove_dir(const char *path); +ssize_t _kern_read_link(const char *path, char *buffer, size_t bufferSize); +status_t _kern_write_link(const char *path, const char *toPath); +status_t _kern_create_symlink(const char *path, const char *toPath, int mode); +status_t _kern_create_link(const char *path, const char *toPath); +status_t _kern_unlink(const char *path); +status_t _kern_rename(const char *oldpath, const char *newpath); +status_t _kern_access(const char *path, int mode); status_t _kern_read_path_stat(const char *path, bool traverseLink, struct stat *stat, size_t statSize); status_t _kern_write_path_stat(const char *path, bool traverseLink, const struct stat *stat, size_t statSize, int statMask); -int sys_select(int numfds, fd_set *readSet, fd_set *writeSet, fd_set *errorSet, - bigtime_t timeout, const sigset_t *sigMask); -int sys_poll(struct pollfd *fds, int numfds, bigtime_t timeout); -int sys_open_attr_dir(int fd, const char *path); -int sys_create_attr(int fd, const char *name, uint32 type, int openMode); -int sys_open_attr(int fd, const char *name, int openMode); -int sys_remove_attr(int fd, const char *name); -int sys_rename_attr(int fromFile, const char *fromName, int toFile, const char *toName); -int sys_open_index_dir(dev_t device); -int sys_create_index(dev_t device, const char *name, uint32 type, uint32 flags); -int sys_read_index_stat(dev_t device, const char *name, struct stat *stat); -int sys_remove_index(dev_t device, const char *name); -int sys_getcwd(char *buffer, size_t size); -int sys_setcwd(int fd, const char *path); +ssize_t _kern_select(int numfds, fd_set *readSet, fd_set *writeSet, fd_set *errorSet, + bigtime_t timeout, const sigset_t *sigMask); +ssize_t _kern_poll(struct pollfd *fds, int numfds, bigtime_t timeout); +int _kern_open_attr_dir(int fd, const char *path); +int _kern_create_attr(int fd, const char *name, uint32 type, int openMode); +int _kern_open_attr(int fd, const char *name, int openMode); +status_t _kern_remove_attr(int fd, const char *name); +status_t _kern_rename_attr(int fromFile, const char *fromName, int toFile, const char *toName); +int _kern_open_index_dir(dev_t device); +status_t _kern_create_index(dev_t device, const char *name, uint32 type, uint32 flags); +status_t _kern_read_index_stat(dev_t device, const char *name, struct stat *stat); +status_t _kern_remove_index(dev_t device, const char *name); +status_t _kern_getcwd(char *buffer, size_t size); +status_t _kern_setcwd(int fd, const char *path); /* calls the syscall dispatcher should use for user file I/O */ -int user_mount(const char *path, const char *device, const char *fs_name, void *args); -int user_unmount(const char *path); +status_t _user_mount(const char *path, const char *device, const char *fs_name, void *args); +status_t _user_unmount(const char *path); status_t _user_read_fs_info(dev_t device, struct fs_info *info); status_t _user_write_fs_info(dev_t device, const struct fs_info *info, int mask); -int user_sync(void); -int user_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode); -int user_open(const char *path, int omode); -int user_open_dir_node_ref(dev_t device, ino_t inode); -int user_open_dir_entry_ref(dev_t device, ino_t inode, const char *uname); -int user_open_dir(const char *path); -int user_fsync(int fd); -off_t user_seek(int fd, off_t pos, int seekType); -int user_create_entry_ref(dev_t device, ino_t inode, const char *uname, int omode, int perms); -int user_create(const char *path, int omode, int perms); -int user_create_dir_entry_ref(dev_t device, ino_t inode, const char *name, int perms); -int user_create_dir(const char *path, int perms); -int user_remove_dir(const char *path); -int user_read_link(const char *path, char *buffer, size_t bufferSize); -int user_write_link(const char *path, const char *toPath); -int user_create_symlink(const char *path, const char *toPath, int mode); -int user_create_link(const char *path, const char *toPath); -int user_unlink(const char *path); -int user_rename(const char *oldpath, const char *newpath); -int user_access(const char *path, int mode); +status_t _user_sync(void); +int _user_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode); +int _user_open(const char *path, int omode); +int _user_open_dir_node_ref(dev_t device, ino_t inode); +int _user_open_dir_entry_ref(dev_t device, ino_t inode, const char *uname); +int _user_open_dir(const char *path); +status_t _user_fsync(int fd); +off_t _user_seek(int fd, off_t pos, int seekType); +int _user_create_entry_ref(dev_t device, ino_t inode, const char *uname, int omode, int perms); +int _user_create(const char *path, int omode, int perms); +status_t _user_create_dir_entry_ref(dev_t device, ino_t inode, const char *name, int perms); +status_t _user_create_dir(const char *path, int perms); +status_t _user_remove_dir(const char *path); +ssize_t _user_read_link(const char *path, char *buffer, size_t bufferSize); +status_t _user_write_link(const char *path, const char *toPath); +status_t _user_create_symlink(const char *path, const char *toPath, int mode); +status_t _user_create_link(const char *path, const char *toPath); +status_t _user_unlink(const char *path); +status_t _user_rename(const char *oldpath, const char *newpath); +status_t _user_access(const char *path, int mode); status_t _user_read_path_stat(const char *path, bool traverseLink, struct stat *stat, size_t statSize); status_t _user_write_path_stat(const char *path, bool traverseLink, const struct stat *stat, size_t statSize, int statMask); -int user_select(int numfds, fd_set *readSet, fd_set *writeSet, fd_set *errorSet, - bigtime_t timeout, const sigset_t *sigMask); -int user_poll(struct pollfd *fds, int numfds, bigtime_t timeout); -int user_open_attr_dir(int fd, const char *path); -int user_create_attr(int fd, const char *name, uint32 type, int openMode); -int user_open_attr(int fd, const char *name, int openMode); -int user_remove_attr(int fd, const char *name); -int user_rename_attr(int fromFile, const char *fromName, int toFile, const char *toName); -int user_open_index_dir(dev_t device); -int user_create_index(dev_t device, const char *name, uint32 type, uint32 flags); -int user_read_index_stat(dev_t device, const char *name, struct stat *stat); -int user_remove_index(dev_t device, const char *name); -int user_getcwd(char *buffer, size_t size); -int user_setcwd(int fd, const char *path); +ssize_t _user_select(int numfds, fd_set *readSet, fd_set *writeSet, fd_set *errorSet, + bigtime_t timeout, const sigset_t *sigMask); +ssize_t _user_poll(struct pollfd *fds, int numfds, bigtime_t timeout); +int _user_open_attr_dir(int fd, const char *path); +int _user_create_attr(int fd, const char *name, uint32 type, int openMode); +int _user_open_attr(int fd, const char *name, int openMode); +status_t _user_remove_attr(int fd, const char *name); +status_t _user_rename_attr(int fromFile, const char *fromName, int toFile, const char *toName); +int _user_open_index_dir(dev_t device); +status_t _user_create_index(dev_t device, const char *name, uint32 type, uint32 flags); +status_t _user_read_index_stat(dev_t device, const char *name, struct stat *stat); +status_t _user_remove_index(dev_t device, const char *name); +status_t _user_getcwd(char *buffer, size_t size); +status_t _user_setcwd(int fd, const char *path); /* fd kernel prototypes (implementation located in fd.c) */ -extern ssize_t sys_read(int fd, off_t pos, void *buffer, size_t bufferSize); -extern ssize_t sys_write(int fd, off_t pos, const void *buffer, size_t bufferSize); -extern int sys_ioctl(int fd, ulong cmd, void *data, size_t length); -extern ssize_t sys_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); -extern status_t sys_rewind_dir(int fd); +extern ssize_t _kern_read(int fd, off_t pos, void *buffer, size_t bufferSize); +extern ssize_t _kern_write(int fd, off_t pos, const void *buffer, size_t bufferSize); +extern status_t _kern_ioctl(int fd, ulong cmd, void *data, size_t length); +extern ssize_t _kern_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); +extern status_t _kern_rewind_dir(int fd); extern status_t _kern_read_stat(int fd, struct stat *stat, size_t statSize); extern status_t _kern_write_stat(int fd, const struct stat *stat, size_t statSize, int statMask); -extern int sys_close(int fd); -extern int sys_dup(int fd); -extern int sys_dup2(int ofd, int nfd); +extern status_t _kern_close(int fd); +extern int _kern_dup(int fd); +extern int _kern_dup2(int ofd, int nfd); /* fd user prototypes (implementation located in fd.c) */ -extern ssize_t user_read(int fd, off_t pos, void *buffer, size_t bufferSize); -extern ssize_t user_write(int fd, off_t pos, const void *buffer, size_t bufferSize); -extern int user_ioctl(int fd, ulong cmd, void *data, size_t length); -extern ssize_t user_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); -extern status_t user_rewind_dir(int fd); +extern ssize_t _user_read(int fd, off_t pos, void *buffer, size_t bufferSize); +extern ssize_t _user_write(int fd, off_t pos, const void *buffer, size_t bufferSize); +extern status_t _user_ioctl(int fd, ulong cmd, void *data, size_t length); +extern ssize_t _user_read_dir(int fd, struct dirent *buffer, size_t bufferSize, uint32 maxCount); +extern status_t _user_rewind_dir(int fd); extern status_t _user_read_stat(int fd, struct stat *stat, size_t statSize); extern status_t _user_write_stat(int fd, const struct stat *stat, size_t statSize, int statMask); -extern int user_close(int fd); -extern int user_dup(int fd); -extern int user_dup2(int ofd, int nfd); +extern status_t _user_close(int fd); +extern int _user_dup(int fd); +extern int _user_dup2(int ofd, int nfd); /* vfs entry points... */