From 1cd08681dd9cf33fe74fd7d864567df43e47c6d5 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 22 Jun 2020 22:01:34 +0000 Subject: [PATCH] msg/async: drop intermediary variables in frame_v2.cc. They were required only because we lacked rvalue-taking variant of `bufferlist::claim_append()`. Signed-off-by: Radoslaw Zarzynski --- src/msg/async/frames_v2.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/msg/async/frames_v2.cc b/src/msg/async/frames_v2.cc index 8fdded42d87..7a0b5907b24 100644 --- a/src/msg/async/frames_v2.cc +++ b/src/msg/async/frames_v2.cc @@ -206,8 +206,7 @@ bufferlist FrameAssembler::asm_secure_rev1(const preamble_block_t& preamble, if (segment_bls[0].length() > 0) { m_crypto->tx->reset_tx_handler({segment_bls[0].length()}); m_crypto->tx->authenticated_encrypt_update(segment_bls[0]); - auto tmp = m_crypto->tx->authenticated_encrypt_final(); - frame_bl.claim_append(tmp); + frame_bl.claim_append(m_crypto->tx->authenticated_encrypt_final()); } if (m_descs.size() == 1) { return frame_bl; // no epilogue if only one segment @@ -234,8 +233,7 @@ bufferlist FrameAssembler::asm_secure_rev1(const preamble_block_t& preamble, } } m_crypto->tx->authenticated_encrypt_update(epilogue_bl); - auto tmp = m_crypto->tx->authenticated_encrypt_final(); - frame_bl.claim_append(tmp); + frame_bl.claim_append(m_crypto->tx->authenticated_encrypt_final()); return frame_bl; } @@ -396,7 +394,7 @@ void FrameAssembler::disasm_first_secure_rev1(bufferlist& preamble_bl, segment_bl.swap(tmp); preamble_bl.splice(sizeof(preamble_block_t), FRAME_PREAMBLE_INLINE_SIZE, &segment_bl); - segment_bl.claim_append(tmp); + segment_bl.claim_append(std::move(tmp)); } else { ceph_assert(segment_bl.length() == 0); preamble_bl.splice(sizeof(preamble_block_t), FRAME_PREAMBLE_INLINE_SIZE, -- 2.47.3