From: Radoslaw Zarzynski Date: Fri, 24 Jul 2020 09:03:38 +0000 (+0000) Subject: common/bl, tests: drop buffer::ptr::clone(). X-Git-Tag: v18.0.0~450^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=893302cdff0c9b25ae1301e24e9fe5d17c9c9de4;p=ceph.git common/bl, tests: drop buffer::ptr::clone(). Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/common/buffer.cc b/src/common/buffer.cc index 0efa576d76a9..18f510394e91 100644 --- a/src/common/buffer.cc +++ b/src/common/buffer.cc @@ -441,11 +441,6 @@ static ceph::spinlock debug_lock; return *this; } - ceph::unique_leakable_ptr buffer::ptr::clone() - { - return _raw->clone(); - } - void buffer::ptr::swap(ptr& other) noexcept { raw *r = _raw; diff --git a/src/include/buffer.h b/src/include/buffer.h index a00d10a4d26e..bb75a3d88be6 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -250,7 +250,6 @@ struct error_code; bool have_raw() const { return _raw ? true:false; } - ceph::unique_leakable_ptr clone(); void swap(ptr& other) noexcept; iterator begin(size_t offset=0) { diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc index 1b604f7bde46..013335d81779 100644 --- a/src/test/bufferlist.cc +++ b/src/test/bufferlist.cc @@ -68,8 +68,7 @@ TEST(Buffer, constructors) { bufferptr ptr(buffer::claim_char(len, str)); EXPECT_EQ(len, ptr.length()); EXPECT_EQ(str, ptr.c_str()); - bufferptr clone = ptr.clone(); - EXPECT_EQ(0, ::memcmp(clone.c_str(), ptr.c_str(), len)); + EXPECT_EQ(0, ::memcmp(str, ptr.c_str(), len)); delete [] str; } // @@ -100,8 +99,7 @@ TEST(Buffer, constructors) { bufferptr ptr(buffer::claim_malloc(len, str)); EXPECT_EQ(len, ptr.length()); EXPECT_EQ(str, ptr.c_str()); - bufferptr clone = ptr.clone(); - EXPECT_EQ(0, ::memcmp(clone.c_str(), ptr.c_str(), len)); + EXPECT_EQ(0, ::memcmp(str, ptr.c_str(), len)); } // // buffer::copy @@ -123,8 +121,6 @@ TEST(Buffer, constructors) { #ifndef DARWIN ASSERT_TRUE(ptr.is_page_aligned()); #endif // DARWIN - bufferptr clone = ptr.clone(); - EXPECT_EQ(0, ::memcmp(clone.c_str(), ptr.c_str(), len)); } } @@ -333,14 +329,6 @@ TEST(BufferPtr, assignment) { } } -TEST(BufferPtr, clone) { - unsigned len = 17; - bufferptr ptr(len); - ::memset(ptr.c_str(), 'X', len); - bufferptr clone = ptr.clone(); - EXPECT_EQ(0, ::memcmp(clone.c_str(), ptr.c_str(), len)); -} - TEST(BufferPtr, swap) { unsigned len = 17;