]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os: Transaction sets default values to avoid duplication in ctors
authorCasey Bodley <cbodley@redhat.com>
Thu, 21 Jan 2016 14:45:05 +0000 (09:45 -0500)
committerCasey Bodley <cbodley@redhat.com>
Fri, 22 Jan 2016 16:02:34 +0000 (11:02 -0500)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/os/ObjectStore.h

index 127d8c0c7eed87f389dfca40c483a258c7cdf6f7..e108d1743e79a0ba7fb298646164091a9ab9f16d 100644 (file)
@@ -442,16 +442,16 @@ public:
   private:
     TransactionData data;
 
-    void *osr; // NULL on replay
+    void *osr {nullptr}; // NULL on replay
 
-    bool use_tbl;   //use_tbl for encode/decode
+    bool use_tbl {false};   //use_tbl for encode/decode
     bufferlist tbl;
 
     map<coll_t, __le32> coll_index;
     map<ghobject_t, __le32, ghobject_t::BitwiseComparator> object_index;
 
-    __le32 coll_id;
-    __le32 object_id;
+    __le32 coll_id {0};
+    __le32 object_id {0};
 
     bufferlist data_bl;
     bufferlist op_bl;
@@ -463,25 +463,12 @@ public:
     list<Context *> on_applied_sync;
 
   public:
-    Transaction() :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) { }
-
-    Transaction(bufferlist::iterator &dp) :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) {
+    Transaction() = default;
+
+    Transaction(bufferlist::iterator &dp) {
       decode(dp);
     }
-
-    Transaction(bufferlist &nbl) :
-      osr(NULL),
-      use_tbl(false),
-      coll_id(0),
-      object_id(0) {
+    Transaction(bufferlist &nbl) {
       bufferlist::iterator dp = nbl.begin();
       decode(dp);
     }