diff --git a/include/webfuse/adapter/mountpoint_factory.h b/include/webfuse/adapter/mountpoint_factory.h index 8a69821..7a10bb1 100644 --- a/include/webfuse/adapter/mountpoint_factory.h +++ b/include/webfuse/adapter/mountpoint_factory.h @@ -23,7 +23,7 @@ struct wf_mountpoint; /// \return newly created mountpoint or NULL, on error /// /// \see wf_server_config_set_mountpoint_factory -/// \see wf_server_protocol_create2 +/// \see wf_server_protocol_create //------------------------------------------------------------------------------ typedef struct wf_mountpoint * wf_create_mountpoint_fn( diff --git a/include/webfuse/adapter/server_protocol.h b/include/webfuse/adapter/server_protocol.h index 8808669..68b1dbe 100644 --- a/include/webfuse/adapter/server_protocol.h +++ b/include/webfuse/adapter/server_protocol.h @@ -32,17 +32,6 @@ struct wf_server_protocol; //------------------------------------------------------------------------------ struct lws_protocols; -//------------------------------------------------------------------------------ -/// \brief Creates a new protocol with a given mounpoint. -/// \deprecated This function will be removed soon. Use \ref -/// wf_server_protocol_create2 instead. -/// -/// \param mount_point root path of UUID-based file system. -/// \return newly created protocol -//------------------------------------------------------------------------------ -extern WF_API struct wf_server_protocol * wf_server_protocol_create( - char * mount_point); - //------------------------------------------------------------------------------ /// \brief Creates a new protocol by a mountpoint factory. /// @@ -53,7 +42,7 @@ extern WF_API struct wf_server_protocol * wf_server_protocol_create( /// \param create_mountpoint factory function to create mountpoints /// \param create_mountpoint_context context of mountpoint factory //------------------------------------------------------------------------------ -extern WF_API struct wf_server_protocol * wf_server_protocol_create2( +extern WF_API struct wf_server_protocol * wf_server_protocol_create( wf_create_mountpoint_fn * create_mountpoint, void * create_mountpoint_context); diff --git a/lib/webfuse/adapter/api.c b/lib/webfuse/adapter/api.c index 6b08e0f..72ab6bc 100644 --- a/lib/webfuse/adapter/api.c +++ b/lib/webfuse/adapter/api.c @@ -38,11 +38,11 @@ void wf_server_interrupt( // server protocol -struct wf_server_protocol * wf_server_protocol_create2( +struct wf_server_protocol * wf_server_protocol_create( wf_create_mountpoint_fn * create_mountpoint, void * create_mountpoint_context) { - return wf_impl_server_protocol_create2(create_mountpoint, create_mountpoint_context); + return wf_impl_server_protocol_create(create_mountpoint, create_mountpoint_context); } void wf_server_protocol_dispose( diff --git a/lib/webfuse/adapter/impl/server_protocol.c b/lib/webfuse/adapter/impl/server_protocol.c index 7bcec27..927d1cb 100644 --- a/lib/webfuse/adapter/impl/server_protocol.c +++ b/lib/webfuse/adapter/impl/server_protocol.c @@ -80,7 +80,7 @@ static int wf_impl_server_protocol_callback( return 0; } -struct wf_server_protocol * wf_impl_server_protocol_create2( +struct wf_server_protocol * wf_impl_server_protocol_create( wf_create_mountpoint_fn * create_mountpoint, void * create_mountpoint_context) { diff --git a/lib/webfuse/adapter/impl/server_protocol.h b/lib/webfuse/adapter/impl/server_protocol.h index 05ebe12..df98c8f 100644 --- a/lib/webfuse/adapter/impl/server_protocol.h +++ b/lib/webfuse/adapter/impl/server_protocol.h @@ -36,7 +36,7 @@ extern void wf_impl_server_protocol_init( extern void wf_impl_server_protocol_cleanup( struct wf_server_protocol * protocol); -extern WF_API struct wf_server_protocol * wf_impl_server_protocol_create2( +extern WF_API struct wf_server_protocol * wf_impl_server_protocol_create( wf_create_mountpoint_fn * create_mountpoint, void * create_mountpoint_context);