From baef74043c9ec5fd7935ce8c336115495a4cc922 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 8 Feb 2013 08:03:02 +0100 Subject: [PATCH] libfuse: remove deprecated fuse_setup(), fuse_teardown() --- ChangeLog | 2 ++ include/fuse.h | 9 --------- lib/fuse_versionscript | 2 -- lib/helper.c | 4 ++-- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 434d100..676ce9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ - fuse_loop_mt_proc() - fuse_read_cmd() - fuse_process_cmd() + - fuse_setup() + - fuse_teardown() 2013-02-06 Miklos Szeredi diff --git a/include/fuse.h b/include/fuse.h index 361befa..3e19aca 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -942,15 +942,6 @@ void fuse_register_module(struct fuse_module *mod); /* NOTE: the following functions are deprecated, and will be removed from the 3.0 API. Use the lowlevel session functions instead */ -/** This is the part of fuse_main() before the event loop */ -struct fuse *fuse_setup(int argc, char *argv[], - const struct fuse_operations *op, size_t op_size, - char **mountpoint, int *multithreaded, - void *user_data); - -/** This is the part of fuse_main() after the event loop */ -void fuse_teardown(struct fuse *fuse, char *mountpoint); - /** Return the exited flag, which indicates if fuse_exit() has been called */ int fuse_exited(struct fuse *f); diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript index 6e72dd6..267063a 100644 --- a/lib/fuse_versionscript +++ b/lib/fuse_versionscript @@ -60,8 +60,6 @@ FUSE_3.0 { fuse_req_interrupt_func; fuse_req_interrupted; fuse_session_remove_chan; - fuse_setup; - fuse_teardown; fuse_unmount; fuse_fs_access; fuse_fs_bmap; diff --git a/lib/helper.c b/lib/helper.c index 76cc25c..a5b540b 100644 --- a/lib/helper.c +++ b/lib/helper.c @@ -248,7 +248,7 @@ void fuse_unmount(const char *mountpoint, struct fuse_chan *ch) fuse_chan_destroy(ch); } -struct fuse *fuse_setup(int argc, char *argv[], +static struct fuse *fuse_setup(int argc, char *argv[], const struct fuse_operations *op, size_t op_size, char **mountpoint, int *multithreaded, void *user_data) { @@ -292,7 +292,7 @@ err_free: return NULL; } -void fuse_teardown(struct fuse *fuse, char *mountpoint) +static void fuse_teardown(struct fuse *fuse, char *mountpoint) { struct fuse_session *se = fuse_get_session(fuse); struct fuse_chan *ch = fuse_session_next_chan(se, NULL); -- 2.30.2