diff options
Diffstat (limited to 'include/fuse.h')
| -rw-r--r-- | include/fuse.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/fuse.h b/include/fuse.h index 0e03a76..9e6c633 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -51,6 +51,9 @@ enum fuse_readdir_flags { FUSE_READDIR_PLUS = (1 << 0) }; +/** + * Readdir flags, passed to fuse_fill_dir_t callback. + */ enum fuse_fill_dir_flags { /** * "Plus" mode: all file attributes are valid @@ -74,7 +77,7 @@ enum fuse_fill_dir_flags { * * @param buf the buffer passed to the readdir() operation * @param name the file name of the directory entry - * @param stat file attributes, can be NULL + * @param stbuf file attributes, can be NULL * @param off offset of the next entry or zero * @param flags fill flags * @return 1 if buffer is full, zero otherwise @@ -664,6 +667,10 @@ struct fuse_operations { */ int (*bmap) (const char *, size_t blocksize, uint64_t *idx); +#if FUSE_USE_VERSION < 35 + int (*ioctl) (const char *, int cmd, void *arg, + struct fuse_file_info *, unsigned int flags, void *data); +#else /** * Ioctl * @@ -680,10 +687,6 @@ struct fuse_operations { * Note : the unsigned long request submitted by the application * is truncated to 32 bits. */ -#if FUSE_USE_VERSION < 35 - int (*ioctl) (const char *, int cmd, void *arg, - struct fuse_file_info *, unsigned int flags, void *data); -#else int (*ioctl) (const char *, unsigned int cmd, void *arg, struct fuse_file_info *, unsigned int flags, void *data); #endif @@ -984,6 +987,10 @@ int fuse_loop(struct fuse *f); */ void fuse_exit(struct fuse *f); +#if FUSE_USE_VERSION < 32 +int fuse_loop_mt_31(struct fuse *f, int clone_fd); +#define fuse_loop_mt(f, clone_fd) fuse_loop_mt_31(f, clone_fd) +#else /** * FUSE event loop with multiple threads * @@ -1015,10 +1022,6 @@ void fuse_exit(struct fuse *f); * * See also: fuse_loop() */ -#if FUSE_USE_VERSION < 32 -int fuse_loop_mt_31(struct fuse *f, int clone_fd); -#define fuse_loop_mt(f, clone_fd) fuse_loop_mt_31(f, clone_fd) -#else int fuse_loop_mt(struct fuse *f, struct fuse_loop_config *config); #endif |