From 6ed438e028f8f30cd91d9ee1c6f4441439dc4736 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 24 Mar 2019 02:10:03 +0100 Subject: [PATCH] fixes some invalid uses of extern "C" --- lib/wsfs/adapter/impl/authenticator.h | 10 +++++----- lib/wsfs/adapter/impl/authenticators.h | 10 +++++----- lib/wsfs/adapter/impl/credentials.h | 10 +++++----- lib/wsfs/adapter/impl/filesystem.h | 10 +++++----- lib/wsfs/adapter/impl/jsonrpc/method.h | 7 +++++++ lib/wsfs/adapter/impl/jsonrpc/method_intern.h | 10 +++++----- lib/wsfs/adapter/impl/jsonrpc/response.h | 8 ++++---- lib/wsfs/adapter/impl/jsonrpc/server.h | 9 +++------ lib/wsfs/adapter/impl/operations.h | 8 ++++---- lib/wsfs/adapter/impl/server.h | 6 +++--- lib/wsfs/adapter/impl/server_config.h | 9 ++++----- lib/wsfs/adapter/impl/time/timeout_manager.h | 10 +++++----- lib/wsfs/adapter/impl/time/timepoint.h | 6 +++--- lib/wsfs/adapter/impl/time/timer.h | 10 +++++----- 14 files changed, 63 insertions(+), 60 deletions(-) diff --git a/lib/wsfs/adapter/impl/authenticator.h b/lib/wsfs/adapter/impl/authenticator.h index fa73cd5..ae213fc 100644 --- a/lib/wsfs/adapter/impl/authenticator.h +++ b/lib/wsfs/adapter/impl/authenticator.h @@ -7,6 +7,11 @@ #include "wsfs/adapter/authenticate.h" +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_authenticator { char * type; @@ -15,11 +20,6 @@ struct wsfs_authenticator struct wsfs_authenticator * next; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern struct wsfs_authenticator * wsfs_authenticator_create( char const * type, wsfs_authenticate_fn * authenticate, diff --git a/lib/wsfs/adapter/impl/authenticators.h b/lib/wsfs/adapter/impl/authenticators.h index 7e88c94..9efbd77 100644 --- a/lib/wsfs/adapter/impl/authenticators.h +++ b/lib/wsfs/adapter/impl/authenticators.h @@ -7,6 +7,11 @@ #include "wsfs/adapter/authenticate.h" +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_authenticator; struct wsfs_credentials; @@ -15,11 +20,6 @@ struct wsfs_authenticators struct wsfs_authenticator * first; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern void wsfs_authenticators_init( struct wsfs_authenticators * authenticators); diff --git a/lib/wsfs/adapter/impl/credentials.h b/lib/wsfs/adapter/impl/credentials.h index 3a587ce..368db1c 100644 --- a/lib/wsfs/adapter/impl/credentials.h +++ b/lib/wsfs/adapter/impl/credentials.h @@ -3,17 +3,17 @@ #include +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_credentials { char * type; json_t * data; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern void wsfs_impl_credentials_init( struct wsfs_credentials * credentials, char const * type, diff --git a/lib/wsfs/adapter/impl/filesystem.h b/lib/wsfs/adapter/impl/filesystem.h index 8772a95..32cc711 100644 --- a/lib/wsfs/adapter/impl/filesystem.h +++ b/lib/wsfs/adapter/impl/filesystem.h @@ -8,6 +8,11 @@ #include "wsfs/adapter/impl/fuse_wrapper.h" #include "wsfs/adapter/impl/operations.h" +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_jsonrpc_server; struct wsfs_filesystem @@ -18,11 +23,6 @@ struct wsfs_filesystem struct wsfs_operations_context user_data; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern bool wsfs_filesystem_init( struct wsfs_filesystem * filesystem, struct wsfs_jsonrpc_server * rpc, diff --git a/lib/wsfs/adapter/impl/jsonrpc/method.h b/lib/wsfs/adapter/impl/jsonrpc/method.h index d8c2ac4..85d9132 100644 --- a/lib/wsfs/adapter/impl/jsonrpc/method.h +++ b/lib/wsfs/adapter/impl/jsonrpc/method.h @@ -8,6 +8,10 @@ #include #include "wsfs/status.h" +#ifdef __cplusplus +extern "C" +{ +#endif typedef bool wsfs_jsonrpc_method_invoke_fn( void * user_data, @@ -18,6 +22,9 @@ typedef void wsfs_jsonrpc_method_finished_fn( wsfs_status status, struct json_t const * result); +#ifdef __cplusplus +} +#endif diff --git a/lib/wsfs/adapter/impl/jsonrpc/method_intern.h b/lib/wsfs/adapter/impl/jsonrpc/method_intern.h index 905c92d..d29a9c0 100644 --- a/lib/wsfs/adapter/impl/jsonrpc/method_intern.h +++ b/lib/wsfs/adapter/impl/jsonrpc/method_intern.h @@ -3,6 +3,11 @@ #include "wsfs/adapter/impl/jsonrpc/method.h" +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_jsonrpc_method { struct wsfs_jsonrpc_method * next; @@ -11,11 +16,6 @@ struct wsfs_jsonrpc_method void * user_data; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern struct wsfs_jsonrpc_method * wsfs_jsonrpc_method_create( char const * name, wsfs_jsonrpc_method_invoke_fn * invoke, diff --git a/lib/wsfs/adapter/impl/jsonrpc/response.h b/lib/wsfs/adapter/impl/jsonrpc/response.h index 00189fb..55272d8 100644 --- a/lib/wsfs/adapter/impl/jsonrpc/response.h +++ b/lib/wsfs/adapter/impl/jsonrpc/response.h @@ -11,6 +11,10 @@ using std::size_t; #include #include "wsfs/status.h" +#ifdef __cplusplus +extern "C" { +#endif + struct wsfs_jsonrpc_response { wsfs_status status; @@ -18,10 +22,6 @@ struct wsfs_jsonrpc_response json_t * result; }; -#ifdef __cplusplus -extern "C" { -#endif - extern void wsfs_jsonrpc_response_init( struct wsfs_jsonrpc_response * response, char const * buffer, diff --git a/lib/wsfs/adapter/impl/jsonrpc/server.h b/lib/wsfs/adapter/impl/jsonrpc/server.h index 78235d0..1b5ced0 100644 --- a/lib/wsfs/adapter/impl/jsonrpc/server.h +++ b/lib/wsfs/adapter/impl/jsonrpc/server.h @@ -16,6 +16,9 @@ using std::size_t; #include "wsfs/adapter/impl/time/timeout_manager.h" #include "wsfs/adapter/impl/time/timer.h" +#ifdef __cplusplus +extern "C" { +#endif struct wsfs_jsonrpc_request { @@ -32,12 +35,6 @@ struct wsfs_jsonrpc_server struct wsfs_jsonrpc_request request; }; - -#ifdef __cplusplus -extern "C" -{ -#endif - extern void wsfs_jsonrpc_server_init( struct wsfs_jsonrpc_server * server, struct wsfs_timeout_manager * manager); diff --git a/lib/wsfs/adapter/impl/operations.h b/lib/wsfs/adapter/impl/operations.h index 480ad85..2b28330 100644 --- a/lib/wsfs/adapter/impl/operations.h +++ b/lib/wsfs/adapter/impl/operations.h @@ -3,6 +3,10 @@ #include "wsfs/adapter/impl/fuse_wrapper.h" +#ifdef __cplusplus +extern "C" { +#endif + struct wsfs_jsonrpc_server; struct wsfs_operations_context @@ -11,10 +15,6 @@ struct wsfs_operations_context double timeout; }; -#ifdef __cplusplus -extern "C" { -#endif - extern void wsfs_operation_lookup ( fuse_req_t req, fuse_ino_t parent, diff --git a/lib/wsfs/adapter/impl/server.h b/lib/wsfs/adapter/impl/server.h index 8185e7d..ed5e290 100644 --- a/lib/wsfs/adapter/impl/server.h +++ b/lib/wsfs/adapter/impl/server.h @@ -1,14 +1,14 @@ #ifndef WSFS_ADAPTER_IMPL_SERVER_H #define WSFS_ADAPTER_IMPL_SERVER_H -struct wsfs_server; -struct wsfs_server_config; - #ifdef __cplusplus extern "C" { #endif +struct wsfs_server; +struct wsfs_server_config; + extern struct wsfs_server * wsfs_impl_server_create( struct wsfs_server_config * config); diff --git a/lib/wsfs/adapter/impl/server_config.h b/lib/wsfs/adapter/impl/server_config.h index 1b498e5..68b2484 100644 --- a/lib/wsfs/adapter/impl/server_config.h +++ b/lib/wsfs/adapter/impl/server_config.h @@ -3,6 +3,10 @@ #include "wsfs/adapter/impl/authenticators.h" +#ifdef __cplusplus +extern "C" { +#endif + struct wsfs_server_config { char * mount_point; @@ -14,11 +18,6 @@ struct wsfs_server_config struct wsfs_authenticators authenticators; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern struct wsfs_server_config * wsfs_impl_server_config_create(void); extern void wsfs_impl_server_config_dispose( diff --git a/lib/wsfs/adapter/impl/time/timeout_manager.h b/lib/wsfs/adapter/impl/time/timeout_manager.h index 8e4fcf7..5c278ad 100644 --- a/lib/wsfs/adapter/impl/time/timeout_manager.h +++ b/lib/wsfs/adapter/impl/time/timeout_manager.h @@ -1,17 +1,17 @@ #ifndef WSFS_ADAPTER_IMPL_TIME_TIMEOUT_MANAGER_H #define WSFS_ADAPTER_IMPL_TIME_TIMEOUT_MANAGER_H +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_timer; struct wsfs_timeout_manager { struct wsfs_timer * timers; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern void wsfs_timeout_manager_init( struct wsfs_timeout_manager * manager); diff --git a/lib/wsfs/adapter/impl/time/timepoint.h b/lib/wsfs/adapter/impl/time/timepoint.h index ed39ff1..1fd614a 100644 --- a/lib/wsfs/adapter/impl/time/timepoint.h +++ b/lib/wsfs/adapter/impl/time/timepoint.h @@ -8,14 +8,14 @@ #include #endif -typedef uint64_t wsfs_timepoint; -typedef int64_t wsfs_timediff; - #ifdef __cplusplus extern "C" { #endif +typedef uint64_t wsfs_timepoint; +typedef int64_t wsfs_timediff; + extern wsfs_timepoint wsfs_timepoint_now(void); extern wsfs_timepoint wsfs_timepoint_in_msec( diff --git a/lib/wsfs/adapter/impl/time/timer.h b/lib/wsfs/adapter/impl/time/timer.h index 9be16dd..b7cf590 100644 --- a/lib/wsfs/adapter/impl/time/timer.h +++ b/lib/wsfs/adapter/impl/time/timer.h @@ -3,6 +3,11 @@ #include "wsfs/adapter/impl/time/timepoint.h" +#ifdef __cplusplus +extern "C" +{ +#endif + struct wsfs_timer; struct wsfs_timeout_manager; @@ -18,11 +23,6 @@ struct wsfs_timer struct wsfs_timer * prev; }; -#ifdef __cplusplus -extern "C" -{ -#endif - extern void wsfs_timer_init( struct wsfs_timer * timer, struct wsfs_timeout_manager * manager);