More cleanups to marshalling logic.

[invirt/third/libt4.git] / lock_client.cc

diff --git a/lock_client.cc b/lock_client.cc
index 6e9fab1..a71a206 100644 (file)
--- a/lock_client.cc
+++ b/lock_client.cc
@@ -1,7 +1,7 @@
 // RPC stubs for clients to talk to lock_server
 
 #include "lock_client.h"
-#include "rpc.h"
+#include "rpc/rpc.h"
 #include <arpa/inet.h>
 
 #include <sstream>
@@ -22,7 +22,7 @@ int
 lock_client::stat(lock_protocol::lockid_t lid)
 {
     int r;
-    lock_protocol::status ret = cl->call(lock_protocol::stat, cl->id(), lid, r);
+    lock_protocol::status ret = cl->call(lock_protocol::stat, r, cl->id(), lid);
     VERIFY (ret == lock_protocol::OK);
     return r;
 }
@@ -31,14 +31,14 @@ lock_protocol::status
 lock_client::acquire(lock_protocol::lockid_t lid)
 {
     int r;
-    return cl->call(lock_protocol::acquire, cl->id(), lid, r);
+    return cl->call(lock_protocol::acquire, r, cl->id(), lid);
 }
 
 lock_protocol::status
 lock_client::release(lock_protocol::lockid_t lid)
 {
     int r;
-    return cl->call(lock_protocol::release, cl->id(), lid, r);
+    return cl->call(lock_protocol::release, r, cl->id(), lid);
 }
 
 t4_lock_client *t4_lock_client_new(const char *dst) {