librados: init all variables in ctors

C_aio_sparse_read_Ack's members are filled in by the only caller immediately after construction, so make them arguments to the constructor. CID 717218: Uninitialized pointer field (UNINIT_CTOR) At (4): Non-static class member "m" is not initialized in this constructor nor in any functions that it calls. WatchContext: these variables are unused, so remove them. CID 717217: Uninitialized scalar field (UNINIT_CTOR) At (4): Non-static class member "ver" is not initialized in this constructor nor in any functions that it calls. Signed-off-by: Josh Durgin <[email protected]>
andy8788 · Sep 25, 2012 · 24ef2ef · 24ef2ef
1 parent fa21924
commit 24ef2ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
@@ -744,9 +744,7 @@ int librados::IoCtxImpl::aio_sparse_read(const object_t oid,
   if (len > (size_t) INT_MAX)
     return -EDOM;
 
-  C_aio_sparse_read_Ack *onack = new C_aio_sparse_read_Ack(c);
-  onack->m = m;
-  onack->data_bl = data_bl;
+  C_aio_sparse_read_Ack *onack = new C_aio_sparse_read_Ack(c, data_bl, m);
   eversion_t ver;
 
   c->io = this;
@@ -1566,8 +1564,10 @@ void librados::IoCtxImpl::C_aio_Ack::finish(int r)
 
 /////////////////////// C_aio_sparse_read_Ack //////////////////////////
 
-librados::IoCtxImpl::C_aio_sparse_read_Ack::C_aio_sparse_read_Ack(AioCompletionImpl *_c)
-  : c(_c)
+librados::IoCtxImpl::C_aio_sparse_read_Ack::C_aio_sparse_read_Ack(AioCompletionImpl *_c,
+								  bufferlist *data,
+								  std::map<uint64_t, uint64_t> *extents)
+  : c(_c), data_bl(data), m(extents)
 {
   c->get();
 }

diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h
@@ -148,8 +148,10 @@ struct librados::IoCtxImpl {
   struct C_aio_sparse_read_Ack : public Context {
     AioCompletionImpl *c;
     bufferlist *data_bl;
-    std::map<uint64_t,uint64_t> *m;
-    C_aio_sparse_read_Ack(AioCompletionImpl *_c);
+    std::map<uint64_t, uint64_t> *m;
+    C_aio_sparse_read_Ack(AioCompletionImpl *_c,
+			  bufferlist *data,
+			  std::map<uint64_t, uint64_t> *extents);
     void finish(int r);
   };
 
@@ -204,8 +206,6 @@ namespace librados {
 struct WatchContext : public RefCountedWaitObject {
   IoCtxImpl *io_ctx_impl;
   const object_t oid;
-  uint64_t cookie;
-  uint64_t ver;
   librados::WatchCtx *ctx;
   uint64_t linger_id;