diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/cuse_lowlevel.h | 6 | ||||
-rw-r--r-- | include/fuse.h | 10 | ||||
-rw-r--r-- | include/fuse_common.h | 12 | ||||
-rw-r--r-- | include/fuse_lowlevel.h | 32 | ||||
-rw-r--r-- | include/fuse_opt.h | 6 |
5 files changed, 29 insertions, 37 deletions
diff --git a/include/cuse_lowlevel.h b/include/cuse_lowlevel.h index e147fa2..80476c2 100644 --- a/include/cuse_lowlevel.h +++ b/include/cuse_lowlevel.h @@ -9,8 +9,8 @@ Read example/cusexmp.c for usages. */ -#ifndef _CUSE_LOWLEVEL_H_ -#define _CUSE_LOWLEVEL_H_ +#ifndef CUSE_LOWLEVEL_H_ +#define CUSE_LOWLEVEL_H_ #ifndef FUSE_USE_VERSION #define FUSE_USE_VERSION 29 @@ -84,4 +84,4 @@ int cuse_lowlevel_main(int argc, char *argv[], const struct cuse_info *ci, } #endif -#endif /* _CUSE_LOWLEVEL_H_ */ +#endif /* CUSE_LOWLEVEL_H_ */ diff --git a/include/fuse.h b/include/fuse.h index e16104c..7f5daa8 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -6,8 +6,8 @@ See the file COPYING.LIB. */ -#ifndef _FUSE_H_ -#define _FUSE_H_ +#ifndef FUSE_H_ +#define FUSE_H_ /** @file * @@ -222,7 +222,7 @@ struct fuse_operations { /** Get file system statistics * - * The 'f_frsize', 'f_favail', 'f_fsid' and 'f_flag' fields are ignored + * The 'f_favail', 'f_fsid' and 'f_flag' fields are ignored * * Replaced 'struct statfs' parameter with 'struct statvfs' in * version 2.5 @@ -705,7 +705,7 @@ void fuse_exit(struct fuse *f); * If you are using multiple threads, you can enjoy all the parallel execution * and interactive response benefits of threads, and you get to enjoy all the * benefits of race conditions and locking bugs, too. Ensure that any code used - * in the callback funtion of fuse_operations is also thread-safe. + * in the callback function of fuse_operations is also thread-safe. * * @param f the FUSE handle * @return 0 if no error occurred, -1 otherwise @@ -936,4 +936,4 @@ struct fuse_session *fuse_get_session(struct fuse *f); } #endif -#endif /* _FUSE_H_ */ +#endif /* FUSE_H_ */ diff --git a/include/fuse_common.h b/include/fuse_common.h index beb44c7..2fa9962 100644 --- a/include/fuse_common.h +++ b/include/fuse_common.h @@ -7,12 +7,12 @@ /** @file */ -#if !defined(_FUSE_H_) && !defined(_FUSE_LOWLEVEL_H_) +#if !defined(FUSE_H_) && !defined(FUSE_LOWLEVEL_H_) #error "Never include <fuse_common.h> directly; use <fuse.h> or <fuse_lowlevel.h> instead." #endif -#ifndef _FUSE_COMMON_H_ -#define _FUSE_COMMON_H_ +#ifndef FUSE_COMMON_H_ +#define FUSE_COMMON_H_ #include "fuse_opt.h" #include <stdint.h> @@ -114,7 +114,7 @@ struct fuse_file_info { #define FUSE_CAP_SPLICE_READ (1 << 9) #define FUSE_CAP_FLOCK_LOCKS (1 << 10) #define FUSE_CAP_IOCTL_DIR (1 << 11) -#define FUSE_CAP_AUTO_INVAL_DATA (1 << 12) +#define FUSE_CAP_AUTO_INVAL_DATA (1 << 12) #define FUSE_CAP_READDIRPLUS (1 << 13) #define FUSE_CAP_READDIRPLUS_AUTO (1 << 14) #define FUSE_CAP_ASYNC_DIO (1 << 15) @@ -429,7 +429,7 @@ struct fuse_bufvec { }; /* Initialize bufvec with a single buffer of given size */ -#define FUSE_BUFVEC_INIT(size__) \ +#define FUSE_BUFVEC_INIT(size__) \ ((struct fuse_bufvec) { \ /* .count= */ 1, \ /* .idx = */ 0, \ @@ -523,4 +523,4 @@ struct _fuse_off_t_must_be_64bit_dummy_struct \ { unsigned _fuse_off_t_must_be_64bit:((sizeof(off_t) == 8) ? 1 : -1); }; #endif -#endif /* _FUSE_COMMON_H_ */ +#endif /* FUSE_COMMON_H_ */ diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h index 32908cb..a01dbf6 100644 --- a/include/fuse_lowlevel.h +++ b/include/fuse_lowlevel.h @@ -6,8 +6,8 @@ See the file COPYING.LIB. */ -#ifndef _FUSE_LOWLEVEL_H_ -#define _FUSE_LOWLEVEL_H_ +#ifndef FUSE_LOWLEVEL_H_ +#define FUSE_LOWLEVEL_H_ /** @file * @@ -602,7 +602,7 @@ struct fuse_lowlevel_ops { * * fi->fh will contain the value set by the opendir method, or * will be undefined if the opendir method didn't set any value. - * + * * Returning a directory entry from readdir() does not affect * its lookup count. * @@ -932,11 +932,11 @@ struct fuse_lowlevel_ops { * kernel supports splicing from the fuse device, then the * data will be made available in pipe for supporting zero * copy data transfer. - * - * buf->count is guaranteed to be one (and thus buf->idx is - * always zero). The write_buf handler must ensure that - * bufv->off is correctly updated (reflecting the number of - * bytes read from bufv->buf[0]). + * + * buf->count is guaranteed to be one (and thus buf->idx is + * always zero). The write_buf handler must ensure that + * bufv->off is correctly updated (reflecting the number of + * bytes read from bufv->buf[0]). * * Introduced in version 2.9 * @@ -1036,7 +1036,7 @@ struct fuse_lowlevel_ops { * * fi->fh will contain the value set by the opendir method, or * will be undefined if the opendir method didn't set any value. - * + * * In contrast to readdir() (which does not affect the lookup counts), * the lookup count of every entry returned by readdirplus(), except "." * and "..", is incremented by one. @@ -1402,7 +1402,7 @@ int fuse_lowlevel_notify_poll(struct fuse_pollhandle *ph); * @return zero for success, -errno for failure */ int fuse_lowlevel_notify_inval_inode(struct fuse_chan *ch, fuse_ino_t ino, - off_t off, off_t len); + off_t off, off_t len); /** * Notify to invalidate parent attributes and the dentry matching @@ -1419,7 +1419,7 @@ int fuse_lowlevel_notify_inval_inode(struct fuse_chan *ch, fuse_ino_t ino, * @return zero for success, -errno for failure */ int fuse_lowlevel_notify_inval_entry(struct fuse_chan *ch, fuse_ino_t parent, - const char *name, size_t namelen); + const char *name, size_t namelen); /** * Notify to invalidate parent attributes and delete the dentry matching @@ -1702,14 +1702,6 @@ int fuse_session_loop_mt(struct fuse_session *se); * ----------------------------------------------------------- */ /** - * Query the file descriptor of the channel - * - * @param ch the channel - * @return the file descriptor passed to fuse_chan_new() - */ -int fuse_chan_fd(struct fuse_chan *ch); - -/** * Obtain counted reference to the channel * * @param ch the channel @@ -1728,4 +1720,4 @@ void fuse_chan_put(struct fuse_chan *ch); } #endif -#endif /* _FUSE_LOWLEVEL_H_ */ +#endif /* FUSE_LOWLEVEL_H_ */ diff --git a/include/fuse_opt.h b/include/fuse_opt.h index 20653b1..d8573e7 100644 --- a/include/fuse_opt.h +++ b/include/fuse_opt.h @@ -6,8 +6,8 @@ See the file COPYING.LIB. */ -#ifndef _FUSE_OPT_H_ -#define _FUSE_OPT_H_ +#ifndef FUSE_OPT_H_ +#define FUSE_OPT_H_ /** @file * @@ -268,4 +268,4 @@ int fuse_opt_match(const struct fuse_opt opts[], const char *opt); } #endif -#endif /* _FUSE_OPT_H_ */ +#endif /* FUSE_OPT_H_ */ |