libfuse: remove deprecated fuse_is_lib_option()

diff --git a/ChangeLog b/ChangeLog
index a9d972de173f544331c7019a245eadbf0ca3acf1..490838d394f05c56d66674e8b34c93a2ee83c3cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
        * libfuse: pass security context options to kernel.  Patch by
        Dalvik Khertel
 
+       * libfuse: remove deprecated features:
+       - fuse_is_lib_option()
+
 2013-02-06  Miklos Szeredi <miklos@szeredi.hu>
 
        * libfuse: set close-on-exec flag on pipe file descriptors.  Patch

diff --git a/include/fuse.h b/include/fuse.h
index 7761f7ce55d46b418379c87c5ed0df22c603fd1f..3279ef1f0bea5e04cc8e6285cf9b8f7ba56b80a9 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -732,9 +732,6 @@ int fuse_interrupted(void);
  */
 int fuse_invalidate(struct fuse *f, const char *path);
 
-/* Deprecated, don't use */
-int fuse_is_lib_option(const char *opt);
-
 /**
  * The real main function
  *

diff --git a/lib/fuse.c b/lib/fuse.c
index fc1013515c2a9aa78a8c4369c35742244d21e97d..49b5dda707445281375e7435dd176afd3a9cee24 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4323,12 +4323,6 @@ static int fuse_lib_opt_proc(void *data, const char *arg, int key,
        return 1;
 }
 
-int fuse_is_lib_option(const char *opt)
-{
-       return fuse_lowlevel_is_lib_option(opt) ||
-               fuse_opt_match(fuse_lib_opts, opt);
-}
-
 static int fuse_init_intr_signal(int signum, int *installed)
 {
        struct sigaction old_sa;

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index ad5a9409c4348a520d6f74208f8a3545c8f73820..9afe49d993efab51fab29b3aa04da271753eca7e 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -4,7 +4,6 @@ FUSE_3.0 {
                fuse_exit;
                fuse_exited;
                fuse_invalidate;
-               fuse_is_lib_option;
                fuse_loop;
                fuse_loop_mt;
                fuse_loop_mt_proc;