Major clean-ups. Migrating to C++11.

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

diff --git a/lock_demo.cc b/lock_demo.cc
index 4d74acb..4285269 100644 (file)
--- a/lock_demo.cc
+++ b/lock_demo.cc
@@ -4,27 +4,20 @@
 
 #include "lock_protocol.h"
 #include "lock_client.h"
 
 #include "lock_protocol.h"
 #include "lock_client.h"

-#include "rpc.h"
+#include "rpc/rpc.h"

 #include <arpa/inet.h>
 #include <vector>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <arpa/inet.h>
 #include <vector>
 #include <stdlib.h>
 #include <stdio.h>
 

-std::string dst;
-lock_client *lc;
-

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {

-  int r;
-
-  if(argc != 2){
-    fprintf(stderr, "Usage: %s [host:]port\n", argv[0]);
-    exit(1);
-  }
+    if(argc != 2) {
+        fprintf(stderr, "Usage: %s [host:]port\n", argv[0]);
+        return 1;
+    }

 
 

-  dst = argv[1];
-  lc = new lock_client(dst);
-  r = lc->stat(1);
-  printf ("stat returned %d\n", r);
+    lock_client *lc = new lock_client(argv[1]);
+    printf ("stat returned %d\n", lc->stat("1"));

 }
 }