FS-10167: Updates to get last blade stuff compiling and running under linux again

diff --git a/libs/libblade/Makefile.am b/libs/libblade/Makefile.am
index 9bbecb6d66ed4e2178c89e8863c944c985aa611c..45378d1b9f01f2c5a62a4b4c305f46d529f010b8 100644 (file)
--- a/libs/libblade/Makefile.am
+++ b/libs/libblade/Makefile.am
@@ -12,7 +12,7 @@ libunqlite_la_LIBADD    = -lpthread
 
 lib_LTLIBRARIES                = libblade.la
 libblade_la_SOURCES     = src/blade.c src/blade_stack.c
-libblade_la_SOURCES    += src/blade_identity.c src/blade_jsonrpc.c src/blade_connection.c src/blade_session.c
+libblade_la_SOURCES    += src/blade_identity.c src/blade_rpc.c src/blade_connection.c src/blade_session.c
 libblade_la_SOURCES    += src/blade_protocol.c
 libblade_la_SOURCES    += src/blade_transport.c src/blade_transport_wss.c
 
@@ -22,7 +22,7 @@ libblade_la_LIBADD      = libunqlite.la
 
 library_includedir     = $(prefix)/include
 library_include_HEADERS = src/include/blade.h src/include/blade_types.h src/include/blade_stack.h
-library_include_HEADERS += src/include/blade_identity.h src/include/blade_jsonrpc.h src/include/blade_connection.h src/include/blade_session.h
+library_include_HEADERS += src/include/blade_identity.h src/include/blade_rpc.h src/include/blade_connection.h src/include/blade_session.h
 library_include_HEADERS += src/include/blade_protocol.h
 library_include_HEADERS += src/include/blade_transport.h src/include/blade_transport_wss.h
 library_include_HEADERS += src/include/unqlite.h test/tap.h

diff --git a/libs/libblade/test/blades.c b/libs/libblade/test/blades.c
index 15eaa2b0176bce2514ea7837291620ea4aabeaaa..4209528640f6660487e475f6b83747470f19db13 100644 (file)
--- a/libs/libblade/test/blades.c
+++ b/libs/libblade/test/blades.c
@@ -34,7 +34,7 @@ ks_bool_t blade_publish_response_handler(blade_rpc_response_t *brpcres, void *da
 
        bh = blade_rpc_response_handle_get(brpcres);
        ks_assert(bh);
-       
+
        bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcres));
        ks_assert(bs);
 
@@ -58,7 +58,7 @@ ks_bool_t test_echo_request_handler(blade_rpc_request_t *brpcreq, void *data)
        bh = blade_rpc_request_handle_get(brpcreq);
        ks_assert(bh);
 
-       bs = blade_handle_sessions_lookup(bh, blade_rpc_response_sessionid_get(brpcreq));
+       bs = blade_handle_sessions_lookup(bh, blade_rpc_request_sessionid_get(brpcreq));
        ks_assert(bs);
 
        // @todo get the inner parameters of a blade.execute request for protocolrpcs