From: Nikolaus Rath Date: Mon, 28 Mar 2016 21:14:10 +0000 (-0700) Subject: Whitespace cleanup. X-Git-Tag: fuse-3.0.0pre0~52 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=01c663699ac276d3ec676972914cf3a375907995;p=qemu-gpiodev%2Flibfuse.git Whitespace cleanup. Applied (whitespace-cleanup) to each file. Having whitespace changes in the VCS is ugly, but it ensures that in the future committers can run this function to *avoid* commiting any whitespace. --- diff --git a/include/fuse_common.h b/include/fuse_common.h index beb44c7..1730513 100644 --- a/include/fuse_common.h +++ b/include/fuse_common.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, \ diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h index 9bdd655..2ce3aa7 100644 --- a/include/fuse_lowlevel.h +++ b/include/fuse_lowlevel.h @@ -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 diff --git a/lib/fuse.c b/lib/fuse.c index 781efb2..a879ffa 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -118,11 +118,11 @@ struct node_table { }; #define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) + const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) #define list_entry(ptr, type, member) \ - container_of(ptr, type, member) + container_of(ptr, type, member) struct list_head { struct list_head *next; @@ -4831,4 +4831,3 @@ void fuse_destroy(struct fuse *f) free(f); fuse_delete_context_key(); } - diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 4fe3678..91568b1 100755 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -1997,7 +1997,7 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) fprintf(stderr, " max_background=%i\n", outarg.max_background); fprintf(stderr, " congestion_threshold=%i\n", - outarg.congestion_threshold); + outarg.congestion_threshold); fprintf(stderr, " time_gran=%u\n", outarg.time_gran); } @@ -2102,7 +2102,7 @@ int fuse_lowlevel_notify_poll(struct fuse_pollhandle *ph) } 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) { struct fuse_notify_inval_inode_out outarg; struct fuse_ll *f; @@ -2126,7 +2126,7 @@ int fuse_lowlevel_notify_inval_inode(struct fuse_chan *ch, fuse_ino_t ino, } 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) { struct fuse_notify_inval_entry_out outarg; struct fuse_ll *f; diff --git a/lib/fuse_signals.c b/lib/fuse_signals.c index b992b71..9fa787c 100755 --- a/lib/fuse_signals.c +++ b/lib/fuse_signals.c @@ -72,4 +72,3 @@ void fuse_remove_signal_handlers(struct fuse_session *se) set_one_signal_handler(SIGTERM, exit_handler, 1); set_one_signal_handler(SIGPIPE, SIG_IGN, 1); } - diff --git a/lib/mount.c b/lib/mount.c index de4ae74..7be7b25 100644 --- a/lib/mount.c +++ b/lib/mount.c @@ -28,12 +28,12 @@ #ifdef __NetBSD__ #include -#define MS_RDONLY MNT_RDONLY -#define MS_NOSUID MNT_NOSUID -#define MS_NODEV MNT_NODEV -#define MS_NOEXEC MNT_NOEXEC -#define MS_SYNCHRONOUS MNT_SYNCHRONOUS -#define MS_NOATIME MNT_NOATIME +#define MS_RDONLY MNT_RDONLY +#define MS_NOSUID MNT_NOSUID +#define MS_NODEV MNT_NODEV +#define MS_NOEXEC MNT_NOEXEC +#define MS_SYNCHRONOUS MNT_SYNCHRONOUS +#define MS_NOATIME MNT_NOATIME #define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0) #endif @@ -398,7 +398,7 @@ static int fuse_mount_fusermount(const char *mountpoint, struct mount_opts *mo, rv = receive_fd(fds[1]); if (!mo->auto_unmount) { - /* with auto_unmount option fusermount will not exit until + /* with auto_unmount option fusermount will not exit until this socket is closed */ close(fds[1]); waitpid(pid, NULL, 0); /* bury zombie */ diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c index 8f3acf0..6a7c958 100644 --- a/lib/mount_bsd.c +++ b/lib/mount_bsd.c @@ -43,7 +43,7 @@ struct mount_opts { char *kernel_opts; }; -#define FUSE_DUAL_OPT_KEY(templ, key) \ +#define FUSE_DUAL_OPT_KEY(templ, key) \ FUSE_OPT_KEY(templ, key), FUSE_OPT_KEY("no" templ, key) static const struct fuse_opt fuse_mount_opts[] = {