From ca984e321e7bfd00e4ea33127d2beface5105e66 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 12 Sep 2013 12:26:41 -0700 Subject: [PATCH] bufferlist: don't use list::size() Reviewed-by: Sage Weil Signed-off-by: Yehuda Sadeh --- src/common/buffer.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/buffer.cc b/src/common/buffer.cc index 0424887139e9b..24a61724c8e81 100644 --- a/src/common/buffer.cc +++ b/src/common/buffer.cc @@ -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::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. } -- 2.39.5