Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

put jsonrpc stuff in own module

Browse Source
This commit is contained in:
Simon Laux
2022-06-25 23:56:56 +02:00
parent 1700af2c8d
commit 33d548eccc
1 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deltachat-ffi/src/lib.rs
View File

@@ -4427,17 +4427,16 @@ pub unsafe extern "C" fn dc_accounts_get_next_event(
} }
#[cfg(feature = "jsonrpc")] #[cfg(feature = "jsonrpc")]
mod jsonrpc {
use super::*;
use deltachat_jsonrpc::api::CommandApi; use deltachat_jsonrpc::api::CommandApi;
#[cfg(feature = "jsonrpc")]
use deltachat_jsonrpc::yerpc::{MessageHandle, RpcHandle}; use deltachat_jsonrpc::yerpc::{MessageHandle, RpcHandle};
#[cfg(feature = "jsonrpc")]
pub struct dc_json_api_instance_t { pub struct dc_json_api_instance_t {
receiver: async_std::channel::Receiver<deltachat_jsonrpc::yerpc::Message>, receiver: async_std::channel::Receiver<deltachat_jsonrpc::yerpc::Message>,
handle: MessageHandle<CommandApi>, handle: MessageHandle<CommandApi>,
} }
#[cfg(feature = "jsonrpc")]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_get_json_api( pub unsafe extern "C" fn dc_get_json_api(
account_manager: *mut dc_accounts_t, account_manager: *mut dc_accounts_t,
@@ -4458,7 +4457,6 @@ pub unsafe extern "C" fn dc_get_json_api(
Box::into_raw(Box::new(instance)) Box::into_raw(Box::new(instance))
} }
#[cfg(feature = "jsonrpc")]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_json_api_unref(json_api_instance: *mut dc_json_api_instance_t) { pub unsafe extern "C" fn dc_json_api_unref(json_api_instance: *mut dc_json_api_instance_t) {
if json_api_instance.is_null() { if json_api_instance.is_null() {
@@ -4469,7 +4467,6 @@ pub unsafe extern "C" fn dc_json_api_unref(json_api_instance: *mut dc_json_api_i
Box::from_raw(json_api_instance); Box::from_raw(json_api_instance);
} }
#[cfg(feature = "jsonrpc")]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_json_request( pub unsafe extern "C" fn dc_json_request(
json_api_instance: *mut dc_json_api_instance_t, json_api_instance: *mut dc_json_api_instance_t,
@@ -4488,7 +4485,6 @@ pub unsafe extern "C" fn dc_json_request(
}); });
} }
#[cfg(feature = "jsonrpc")]
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn dc_get_next_json_response( pub unsafe extern "C" fn dc_get_next_json_response(
json_api_instance: *mut dc_json_api_instance_t, json_api_instance: *mut dc_json_api_instance_t,
@@ -4502,3 +4498,4 @@ pub unsafe extern "C" fn dc_get_next_json_response(
.map(|result| serde_json::to_string(&result).unwrap_or_default().strdup()) .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
.unwrap_or(ptr::null_mut()) .unwrap_or(ptr::null_mut())
} }
}