Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts the last 2 Rpc changes (#114)

Browse Source 
* Revert "Fully asigns the ConnectionInfo struct (#113)"

This reverts commit 9a3100b221.

* Revert "Passes the ConnectionInfo of the Rpc client on server callback (#112)"

This reverts commit 7e9754acff.
This commit is contained in:
Thad House
2016-09-16 22:23:58 -07:00
committed by Peter Johnson
parent 9a3100b221
commit e952236e1a
8 changed files with 12 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ntcore_c.cpp
View File

@@ -68,7 +68,6 @@ static void ConvertToC(const RpcDefinition& in, NT_RpcDefinition* out) {
static void ConvertToC(const RpcCallInfo& in, NT_RpcCallInfo* out) {
out->rpc_id = in.rpc_id;
out->call_uid = in.call_uid;
ConvertToC(in.conn_info, &out->conn_info);
ConvertToC(in.name, &out->name);
ConvertToC(in.params, &out->params);
}
@@ -235,17 +234,12 @@ void NT_CreateRpc(const char *name, size_t name_len, const char *def,
size_t def_len, void *data, NT_RpcCallback callback) {
nt::CreateRpc(
StringRef(name, name_len), StringRef(def, def_len),
[=](StringRef name, StringRef params,
const ConnectionInfo& conn_info) -> std::string {
NT_ConnectionInfo conn_c;
ConvertToC(conn_info, &conn_c);
[=](StringRef name, StringRef params) -> std::string {
size_t results_len;
char* results_c = callback(data, name.data(), name.size(),
params.data(), params.size(),
&conn_c, &results_len);
params.data(), params.size(), &results_len);
std::string results(results_c, results_len);
std::free(results_c);
DisposeConnectionInfo(&conn_c);
return results;
});
}
@@ -527,7 +521,6 @@ void NT_DisposeRpcDefinition(NT_RpcDefinition *def) {
}
void NT_DisposeRpcCallInfo(NT_RpcCallInfo *call_info) {
DisposeConnectionInfo(&call_info->conn_info);
NT_DisposeString(&call_info->name);
NT_DisposeString(&call_info->params);
}