Rename fuse_main_real_317 to fuse_main_real_versioned

As suggested by Bill in Issue #1092, rename to _versioned
so that applications using dlopen/dlvsym better understand
the meaning of this function.

Signed-off-by: Bernd Schubert <bernd@bsbernd.com>

diff --git a/include/fuse.h b/include/fuse.h
index 969ed97855f96fc02972d6342f207db39a5de70a..70d0d13ab9bff7fb2fa58d1d88b6d5eef4de2983 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -896,12 +896,14 @@ static inline int fuse_main_real(int argc, char *argv[],
                 __func__);
 
        /* not declared globally, to restrict usage of this function */
-       int fuse_main_real_317(int argc, char *argv[],
-                              const struct fuse_operations *op, size_t op_size,
-                              struct libfuse_version *version,
-                              void *user_data);
-
-       return fuse_main_real_317(argc, argv, op, op_size, &version, user_data);
+       int fuse_main_real_versioned(int argc, char *argv[],
+                                    const struct fuse_operations *op,
+                                    size_t op_size,
+                                    struct libfuse_version *version,
+                                    void *user_data);
+
+       return fuse_main_real_versioned(argc, argv, op, op_size, &version,
+                                       user_data);
 }
 
 /**
@@ -970,12 +972,13 @@ fuse_main(int argc, char *argv[], const struct fuse_operations *op,
        };
 
        /* not declared globally, to restrict usage of this function */
-       int fuse_main_real_317(int argc, char *argv[],
-                              const struct fuse_operations *op, size_t op_size,
-                              struct libfuse_version *version,
-                              void *user_data);
-       return fuse_main_real_317(argc, argv, op, sizeof(*(op)), &version,
-                                 user_data);
+       int fuse_main_real_versioned(int argc, char *argv[],
+                                    const struct fuse_operations *op,
+                                    size_t op_size,
+                                    struct libfuse_version *version,
+                                    void *user_data);
+       return fuse_main_real_versioned(argc, argv, op, sizeof(*(op)), &version,
+                                       user_data);
 }
 
 /* ----------------------------------------------------------- *

diff --git a/lib/helper.c b/lib/helper.c
index 660f029cd8ed84ded92dc9f5d2770d1f425e6f04..cab5ada70fb50001120f91e372a113f201157a2d 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -305,11 +305,12 @@ int fuse_daemonize(int foreground)
 }
 
 /* Not symboled, as not part of the official API */
-int fuse_main_real_317(int argc, char *argv[], const struct fuse_operations *op,
-                      size_t op_size, struct libfuse_version *version,
-                      void *user_data);
-int fuse_main_real_317(int argc, char *argv[], const struct fuse_operations *op,
-                  size_t op_size, struct libfuse_version *version, void *user_data)
+int fuse_main_real_versioned(int argc, char *argv[],
+                            const struct fuse_operations *op, size_t op_size,
+                            struct libfuse_version *version, void *user_data);
+int fuse_main_real_versioned(int argc, char *argv[],
+                            const struct fuse_operations *op, size_t op_size,
+                            struct libfuse_version *version, void *user_data)
 {
        struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
        struct fuse *fuse;
@@ -408,7 +409,8 @@ int fuse_main_real_30(int argc, char *argv[], const struct fuse_operations *op,
                      size_t op_size, void *user_data)
 {
        struct libfuse_version version = { 0 };
-       return fuse_main_real_317(argc, argv, op, op_size, &version, user_data);
+       return fuse_main_real_versioned(argc, argv, op, op_size, &version,
+                                       user_data);
 }
 
 void fuse_apply_conn_info_opts(struct fuse_conn_info_opts *opts,