From 53eefce4e735dd1d8f77ceadfc8beb9679390e08 Mon Sep 17 00:00:00 2001 From: Bernd Schubert Date: Sat, 8 Feb 2025 14:35:46 +0100 Subject: Rename to fuse_session_new_versioned Similar previous renames to fuse_main_real_versioned, but here for the low level fuse_session_new. Also remove symbol versioned as part of "fuse_session_new" as that function is not part of the official API/ABI and to allow easier access with dlopen/dlsym. Also switch back to a macro fuse_session_new, just in case some code has some expectations on that. Signed-off-by: Bernd Schubert --- include/fuse_lowlevel.h | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'include') diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h index f8213ca..d0617ba 100644 --- a/include/fuse_lowlevel.h +++ b/include/fuse_lowlevel.h @@ -2047,18 +2047,6 @@ int fuse_parse_cmdline_312(struct fuse_args *args, #endif #endif -/* Do not call this directly, but only through fuse_session_new() */ -#if (!defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS)) -struct fuse_session * -_fuse_session_new_317(struct fuse_args *args, - const struct fuse_lowlevel_ops *op, - size_t op_size, - struct libfuse_version *version, - void *userdata); -#define _fuse_session_new(args, op, op_size, version, userdata) \ - _fuse_session_new_317(args, op, op_size, version, userdata) -#endif - /** * Create a low level session. * @@ -2088,10 +2076,8 @@ _fuse_session_new_317(struct fuse_args *args, * @return the fuse session on success, NULL on failure **/ static inline struct fuse_session * -fuse_session_new(struct fuse_args *args, - const struct fuse_lowlevel_ops *op, - size_t op_size, - void *userdata) +fuse_session_new_fn(struct fuse_args *args, const struct fuse_lowlevel_ops *op, + size_t op_size, void *userdata) { struct libfuse_version version = { .major = FUSE_MAJOR_VERSION, @@ -2101,13 +2087,16 @@ fuse_session_new(struct fuse_args *args, }; /* not declared globally, to restrict usage of this function */ - struct fuse_session *_fuse_session_new( + struct fuse_session *fuse_session_new_versioned( struct fuse_args *args, const struct fuse_lowlevel_ops *op, size_t op_size, struct libfuse_version *version, void *userdata); - return _fuse_session_new(args, op, op_size, &version, userdata); + return fuse_session_new_versioned(args, op, op_size, &version, + userdata); } +#define fuse_session_new(args, op, op_size, userdata) \ + fuse_session_new_fn(args, op, op_size, userdata) /* * This should mostly not be called directly, but instead the -- cgit v1.2.3