Cleanups

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

diff --git a/lock_client.h b/lock_client.h
index 7b5edf6..541cc23 100644 (file)
--- a/lock_client.h
+++ b/lock_client.h
@@ -16,7 +16,7 @@
 class lock_release_user {
     public:
         virtual void dorelease(lock_protocol::lockid_t) = 0;
-        virtual ~lock_release_user() {};
+        virtual ~lock_release_user() {}
 };
 
 using std::string;
@@ -57,19 +57,19 @@ class lock_client {
         std::thread releaser_thread;
         rsm_client *rsmc;
         class lock_release_user *lu;
-        int rlock_port;
+        unsigned int rlock_port;
         string hostname;
         string id;
         mutex xid_mutex;
-        lock_protocol::xid_t xid;
+        lock_protocol::xid_t next_xid;
         fifo<lock_protocol::lockid_t> release_fifo;
         mutex lock_table_lock;
         lock_map lock_table;
         lock_state &get_lock_state(lock_protocol::lockid_t lid);
     public:
-        static int last_port;
+        static unsigned int last_port;
         lock_client(string xdst, class lock_release_user *l = 0);
-        ~lock_client() {};
+        ~lock_client() {}
         lock_protocol::status acquire(lock_protocol::lockid_t);
         lock_protocol::status release(lock_protocol::lockid_t);
         int stat(lock_protocol::lockid_t);