]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
bufferlist: don't use list::size()
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 12 Sep 2013 19:26:41 +0000 (12:26 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 20 Sep 2013 15:55:12 +0000 (08:55 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
src/common/buffer.cc

index 0424887139e9be1c041f77c733ed8ba053370990..24a61724c8e814cdc8c9a2eefa159d7d721ca341 100644 (file)
@@ -990,11 +990,14 @@ void buffer::list::rebuild_page_aligned()
    */
   char *buffer::list::c_str()
   {
-    if (_buffers.size() == 0) 
+    if (_buffers.empty())
       return 0;                         // no buffers
-    if (_buffers.size() > 1) 
+
+    std::list<ptr>::const_iterator iter = _buffers.begin();
+    iter++;
+
+    if (iter != _buffers.end())
       rebuild();
-    assert(_buffers.size() == 1);
     return _buffers.front().c_str();  // good, we're already contiguous.
   }