diff options
| author |  Nikolaus Rath <Nikolaus@rath.org> | 2016-10-02 21:21:22 -0700 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2016-10-02 21:24:43 -0700 |
| commit | ba12a8f7e315950e840e942de8c2d36dc78dddf7 (patch) | |
| tree | 384b817cf2d9efd156d491288b9630d1770404a3 /lib | |
| parent | d968b4ddaeead5296b31f5c02f4f0e966372390a (diff) | |
Merged fuse_mt.c into fuse.c
There is no point in having a separate file for a 10 line function.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/fuse.c | 14 | ||||
| -rw-r--r-- | lib/fuse_mt.c | 25 |
3 files changed, 14 insertions, 26 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 2ad0f15..1d50b0e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,7 +24,6 @@ libfuse3_la_SOURCES = \ fuse_loop_mt.c \ fuse_lowlevel.c \ fuse_misc.h \ - fuse_mt.c \ fuse_opt.c \ fuse_session.c \ fuse_signals.c \ @@ -4379,6 +4379,20 @@ int fuse_loop(struct fuse *f) return fuse_session_loop(f->se); } +int fuse_loop_mt(struct fuse *f) +{ + if (f == NULL) + return -1; + + int res = fuse_start_cleanup_thread(f); + if (res) + return -1; + + res = fuse_session_loop_mt(fuse_get_session(f)); + fuse_stop_cleanup_thread(f); + return res; +} + void fuse_exit(struct fuse *f) { fuse_session_exit(f->se); diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c deleted file mode 100644 index be5d644..0000000 --- a/lib/fuse_mt.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - FUSE: Filesystem in Userspace - Copyright (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu> - - This program can be distributed under the terms of the GNU LGPLv2. - See the file COPYING.LIB. -*/ - -#include "config.h" -#include "fuse.h" -#include "fuse_lowlevel.h" - -int fuse_loop_mt(struct fuse *f) -{ - if (f == NULL) - return -1; - - int res = fuse_start_cleanup_thread(f); - if (res) - return -1; - - res = fuse_session_loop_mt(fuse_get_session(f)); - fuse_stop_cleanup_thread(f); - return res; -} |