Renamed fuse_lowlevel_new() to fuse_session_new().

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 87ceae9b5763dd1f4e44f762155c723200abf3a2..23c606eb6567338197ce1e3596d34b8ffdf69104 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,9 @@
 Unreleased Changes
 ==================
 
+* The `fuse_lowlevel_new` function has been renamed to
+  `fuse_session_new`.
+
 * There are now new `fuse_session_unmount` and `fuse_session_mount`
   functions that should be used in the low-level API. The
   `fuse_mount` and `fuse_unmount` functions should be used with the

diff --git a/example/fuse_lo-plus.c b/example/fuse_lo-plus.c
index 30ad21e9a4b45877a4503ee1cf2829a167a5869d..e79c727905cb196a20dd5a3e084076c32ce475a8 100644 (file)
--- a/example/fuse_lo-plus.c
+++ b/example/fuse_lo-plus.c
@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
        if (fuse_parse_cmdline(&args, &mountpoint, NULL, NULL) != -1 &&
            (ch = fuse_session_mount(mountpoint, &args)) != NULL) {
                struct fuse_session *se;
-               se = fuse_lowlevel_new(&args, &lo_oper, sizeof(lo_oper), &lo);
+               se = fuse_session_new(&args, &lo_oper, sizeof(lo_oper), &lo);
                if (se != NULL) {
                        if (fuse_set_signal_handlers(se) != -1) {
                                fuse_session_add_chan(se, ch);

diff --git a/example/hello_ll.c b/example/hello_ll.c
index 3c87bc658aa0c315a0203dd89a16b212f8bb12da..528b2160ff5d1aa50fe6061a97fb5085b50c4465 100755 (executable)
--- a/example/hello_ll.c
+++ b/example/hello_ll.c
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
            (ch = fuse_session_mount(mountpoint, &args)) != NULL) {
                struct fuse_session *se;
 
-               se = fuse_lowlevel_new(&args, &hello_ll_oper,
+               se = fuse_session_new(&args, &hello_ll_oper,
                                       sizeof(hello_ll_oper), NULL);
                if (se != NULL) {
                        if (fuse_set_signal_handlers(se) != -1) {

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 6b2fa3f1a3afd9741537fdc74085c5dd0076119c..9656c983626aa14392ba59242519fcf4e320b4bb 100644 (file)
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -170,7 +170,7 @@ struct fuse_lowlevel_ops {
         *
         * There's no reply to this function
         *
-        * @param userdata the user data passed to fuse_lowlevel_new()
+        * @param userdata the user data passed to fuse_session_new()
         */
        void (*init) (void *userdata, struct fuse_conn_info *conn);
 
@@ -181,7 +181,7 @@ struct fuse_lowlevel_ops {
         *
         * There's no reply to this function
         *
-        * @param userdata the user data passed to fuse_lowlevel_new()
+        * @param userdata the user data passed to fuse_session_new()
         */
        void (*destroy) (void *userdata);
 
@@ -1502,7 +1502,7 @@ int fuse_lowlevel_notify_retrieve(struct fuse_session *se, fuse_ino_t ino,
  * Get the userdata from the request
  *
  * @param req request handle
- * @return the user data passed to fuse_lowlevel_new()
+ * @return the user data passed to fuse_session_new()
  */
 void *fuse_req_userdata(fuse_req_t req);
 
@@ -1602,17 +1602,18 @@ struct fuse_chan *fuse_session_mount(const char *mountpoint,
  * prints the requsted information to stdout and returns NULL.
  *
  * @param args argument vector
- * @param op the low level filesystem operations
+ * @param op the (low-level) filesystem operations
  * @param op_size sizeof(struct fuse_lowlevel_ops)
  * @param userdata user data
- * @return the created session object, or NULL on failure
+ *
+ * @return the fuse session on success, NULL on failure
  *
  * Example: See hello_ll.c:
  *   \snippet hello_ll.c doxygen_fuse_lowlevel_usage
- */
-struct fuse_session *fuse_lowlevel_new(struct fuse_args *args,
-                                      const struct fuse_lowlevel_ops *op,
-                                      size_t op_size, void *userdata);
+ **/
+struct fuse_session *fuse_session_new(struct fuse_args *args,
+                                     const struct fuse_lowlevel_ops *op,
+                                     size_t op_size, void *userdata);
 
 /**
  * Assign a channel to a session

diff --git a/lib/cuse_lowlevel.c b/lib/cuse_lowlevel.c
index cef14c66c826b92f40b13cb293f339a6d87f314a..3dd79d8d729bc9e50c2a41a9fcf912b0e99195e9 100644 (file)
--- a/lib/cuse_lowlevel.c
+++ b/lib/cuse_lowlevel.c
@@ -170,7 +170,7 @@ struct fuse_session *cuse_lowlevel_new(struct fuse_args *args,
        lop.ioctl       = clop->ioctl           ? cuse_fll_ioctl        : NULL;
        lop.poll        = clop->poll            ? cuse_fll_poll         : NULL;
 
-       se = fuse_lowlevel_new(args, &lop, sizeof(lop), userdata);
+       se = fuse_session_new(args, &lop, sizeof(lop), userdata);
        if (!se) {
                free(cd);
                return NULL;

diff --git a/lib/fuse.c b/lib/fuse.c
index e17b6b37fa34e4b790002dd885227660293acaf8..47b72d0a9f38be06a49b9a9d7f0565e516f786bc 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4719,7 +4719,7 @@ struct fuse *fuse_new(struct fuse_chan *ch, struct fuse_args *args,
 
        /* This function will return NULL if there is an --help
           or --version argument in `args` */
-       f->se = fuse_lowlevel_new(args, &llop, sizeof(llop), f);
+       f->se = fuse_session_new(args, &llop, sizeof(llop), f);
        if (f->se == NULL) {
                if (f->conf.help)
                        fuse_lib_help_modules();

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index ad10175041b21f6b84373ea9d709d19578f0d6eb..92265cc819051e3104d8a54170289e01703aa1e5 100755 (executable)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2871,9 +2871,9 @@ restart:
 
 #define MIN_BUFSIZE 0x21000
 
-struct fuse_session *fuse_lowlevel_new(struct fuse_args *args,
-                                      const struct fuse_lowlevel_ops *op,
-                                      size_t op_size, void *userdata)
+struct fuse_session *fuse_session_new(struct fuse_args *args,
+                                     const struct fuse_lowlevel_ops *op,
+                                     size_t op_size, void *userdata)
 {
        int err;
        struct fuse_ll *f;

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 9c29669d8105e1d467155f699aa14ef3d5ba2e3d..eacd37a45b6be1e3456a28e332de19e83e5d77d6 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -39,7 +39,7 @@ FUSE_3.0 {
                fuse_daemonize;
                fuse_get_session;
                fuse_interrupted;
-               fuse_lowlevel_new;
+               fuse_session_new;
                fuse_main_real;
                fuse_mount;
                fuse_session_mount;