diff options
Diffstat (limited to 'nuttx/include/nuttx/fs/fs.h')
| -rw-r--r-- | nuttx/include/nuttx/fs/fs.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/nuttx/include/nuttx/fs/fs.h b/nuttx/include/nuttx/fs/fs.h index 4a883792a..f73b0b0cf 100644 --- a/nuttx/include/nuttx/fs/fs.h +++ b/nuttx/include/nuttx/fs/fs.h @@ -71,20 +71,20 @@ struct file_operations { /* The device driver open method differs from the mountpoint open method */ - int (*open)(FAR struct file *filp); + int (*open)(FAR struct file *filep); /* The following methods must be identical in signature and position because * the struct file_operations and struct mountp_operations are treated like * unions. */ - int (*close)(FAR struct file *filp); - ssize_t (*read)(FAR struct file *filp, FAR char *buffer, size_t buflen); - ssize_t (*write)(FAR struct file *filp, FAR const char *buffer, size_t buflen); - off_t (*seek)(FAR struct file *filp, off_t offset, int whence); - int (*ioctl)(FAR struct file *filp, int cmd, unsigned long arg); + int (*close)(FAR struct file *filep); + ssize_t (*read)(FAR struct file *filep, FAR char *buffer, size_t buflen); + ssize_t (*write)(FAR struct file *filep, FAR const char *buffer, size_t buflen); + off_t (*seek)(FAR struct file *filep, off_t offset, int whence); + int (*ioctl)(FAR struct file *filep, int cmd, unsigned long arg); #ifndef CONFIG_DISABLE_POLL - int (*poll)(FAR struct file *filp, struct pollfd *fds, bool setup); + int (*poll)(FAR struct file *filep, struct pollfd *fds, bool setup); #endif /* The two structures need not be common after this point */ @@ -139,7 +139,7 @@ struct mountpt_operations * information to manage privileges. */ - int (*open)(FAR struct file *filp, FAR const char *relpath, + int (*open)(FAR struct file *filep, FAR const char *relpath, int oflags, mode_t mode); /* The following methods must be identical in signature and position because @@ -147,11 +147,11 @@ struct mountpt_operations * unions. */ - int (*close)(FAR struct file *filp); - ssize_t (*read)(FAR struct file *filp, FAR char *buffer, size_t buflen); - ssize_t (*write)(FAR struct file *filp, FAR const char *buffer, size_t buflen); - off_t (*seek)(FAR struct file *filp, off_t offset, int whence); - int (*ioctl)(FAR struct file *filp, int cmd, unsigned long arg); + int (*close)(FAR struct file *filep); + ssize_t (*read)(FAR struct file *filep, FAR char *buffer, size_t buflen); + ssize_t (*write)(FAR struct file *filep, FAR const char *buffer, size_t buflen); + off_t (*seek)(FAR struct file *filep, off_t offset, int whence); + int (*ioctl)(FAR struct file *filep, int cmd, unsigned long arg); /* The two structures need not be common after this point. The following * are extended methods needed to deal with the unique needs of mounted @@ -160,7 +160,7 @@ struct mountpt_operations * Additional open-file-specific mountpoint operations: */ - int (*sync)(FAR struct file *filp); + int (*sync)(FAR struct file *filep); int (*dup)(FAR const struct file *oldp, FAR struct file *newp); /* Directory operations */ @@ -273,7 +273,7 @@ struct filelist #if CONFIG_NFILE_STREAMS > 0 struct file_struct { - int fs_filedes; /* File descriptor associated with stream */ + int fs_fd; /* File descriptor associated with stream */ #if CONFIG_STDIO_BUFFER_SIZE > 0 sem_t fs_sem; /* For thread safety */ pid_t fs_holder; /* Holder of sem */ @@ -621,7 +621,7 @@ int lib_flushall(FAR struct streamlist *list); ssize_t lib_sendfile(int outfd, int infd, off_t *offset, size_t count); #endif -/* fs/fs_read.c *************************************************************/ +/* fs/fs_fileread.c *********************************************************/ /**************************************************************************** * Name: file_read * @@ -636,7 +636,7 @@ ssize_t lib_sendfile(int outfd, int infd, off_t *offset, size_t count); ssize_t file_read(FAR struct file *filep, FAR void *buf, size_t nbytes); #endif -/* fs/fs_lseek.c ************************************************************/ +/* fs/fs_fileread.c *********************************************************/ /**************************************************************************** * Name: file_seek * |